remaining build modifications to match the src structure. Appended -${version} to jar names to allow easy upload to the central maven repository.
git-svn-id: https://svn.apache.org/repos/asf/incubator/jsecurity/trunk@733415 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/README-runtime-requirements.txt b/README-runtime-requirements.txt
index d7e0e0e..49a51f8 100644
--- a/README-runtime-requirements.txt
+++ b/README-runtime-requirements.txt
@@ -15,8 +15,6 @@
Feature-based dependencies
--------------------------
-- If you want to use JSecurity's enterprise session management (heterogeneous clients, SSO support, etc):
- . include ehcache.jar and backport-util-concurrent.jar
-
-- JSecurity Web Filter text-based config ('config' init param) in web.xml or JSecurity code Annotations:
+- .ini based configuration, either for a jsecurity.ini file in the classpath or embedded .ini in the JSecurityFilter
+ in web.xml:
. include Jakarta commons-beanutils-core.jar
diff --git a/build.xml b/build.xml
index 73a2c35..f1f1ab6 100644
--- a/build.xml
+++ b/build.xml
@@ -133,12 +133,32 @@
</antcall>
</target>
+ <macrodef name="jarjar">
+ <attribute name="jardir" default="${dist.dir}"/>
+ <attribute name="jdksuffix" default=""/>
+ <sequential>
+ <jar destfile="@{jardir}/${project.name}@{jdksuffix}-${version}.jar" duplicate="fail">
+ <zipfileset src="@{jardir}/${project.name}-core@{jdksuffix}-${version}.jar"/>
+ <zipfileset src="@{jardir}/${project.name}-web@{jdksuffix}-${version}.jar"/>
+ <zipfileset src="@{jardir}/${project.name}-ehcache@{jdksuffix}-${version}.jar"/>
+ <zipfileset src="@{jardir}/${project.name}-quartz@{jdksuffix}-${version}.jar"/>
+ <zipfileset src="@{jardir}/${project.name}-spring@{jdksuffix}-${version}.jar"/>
+ </jar>
+ </sequential>
+ </macrodef>
+
<target name="package" depends="retrieve-dependencies,init" description="Creates project artifacts">
<echo message="Packaging all modules..."/>
<antcall target="template">
<param name="target" value="package"/>
</antcall>
+ <!-- Now that each module has been packaged, make a 'master' .jar that includes everything. This allows
+ end-users to choose to use a single jar or multiple jars depending on their preference: -->
+ <jarjar/>
+ <jarjar jardir="${dist.dir}/jdk14" jdksuffix="-jdk14"/>
+ <jarjar jardir="${dist.dir}/jdk13" jdksuffix="-jdk13"/>
+
</target>
<target name="samples.quickstart" depends="jar" description="Creates the quickstart .jar">
diff --git a/common.ant.xml b/common.ant.xml
index 7642d7d..07c6bdf 100644
--- a/common.ant.xml
+++ b/common.ant.xml
@@ -16,9 +16,9 @@
<property environment="env"/>
<!-- version of the product, see http://apr.apache.org/versioning.html for details on this convention -->
- <property name="version.major" value="0"/>
- <property name="version.minor" value="9"/>
- <property name="version.revision" value="0"/>
+ <property name="version.major" value="1"/>
+ <property name="version.minor" value="0"/>
+ <property name="version.revision" value="0-SNAPSHOT"/>
<property name="version" value="${version.major}.${version.minor}.${version.revision}"/>
<property name="release.name" value="${project.name}-${version}"/>
@@ -138,9 +138,9 @@
<mkdir dir="${dist.dir}/jdk13"/>
<mkdir dir="${dist.dir}/jdk14"/>
<retroweaver target="1.3" inputjar="${dist.jar}"
- outputjar="${dist.dir}/jdk13/${project.name}-${module.name}-jdk13.jar"/>
+ outputjar="${dist.dir}/jdk13/${project.name}-${module.name}-jdk13-${version}.jar"/>
<retroweaver target="1.4" inputjar="${dist.jar}"
- outputjar="${dist.dir}/jdk14/${project.name}-${module.name}-jdk14.jar"/>
+ outputjar="${dist.dir}/jdk14/${project.name}-${module.name}-jdk14-${version}.jar"/>
</target>
<target name="jar" depends="jar.retroweaver"/>
diff --git a/core/build.xml b/core/build.xml
index 04daee1..ecf39a7 100644
--- a/core/build.xml
+++ b/core/build.xml
@@ -5,7 +5,7 @@
<property name="root.base.dir" value=".."/>
<property name="module.name" value="core"/>
<import file="${root.base.dir}/common.ant.xml"/>
- <property name="dist.jarName" value="${project.name}-${module.name}"/>
+ <property name="dist.jarName" value="${project.name}-${module.name}-${version}"/>
<property name="dist.jar" value="${dist.dir}/${dist.jarName}.jar"/>
<path id="compile.path">
diff --git a/jsecurity.iml b/jsecurity.iml
index 45767f9..df9a6d5 100644
--- a/jsecurity.iml
+++ b/jsecurity.iml
@@ -63,7 +63,6 @@
<sourceFolder url="file://$MODULE_DIR$/samples/spring/etc" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/samples/spring/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/samples/standalone/src" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/support/ehcache/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/support/quartz/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/support/spring/src" isTestSource="false" />
@@ -71,6 +70,16 @@
<sourceFolder url="file://$MODULE_DIR$/web/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/web/test" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/build" />
+ <excludeFolder url="file://$MODULE_DIR$/core/build" />
+ <excludeFolder url="file://$MODULE_DIR$/lib" />
+ <excludeFolder url="file://$MODULE_DIR$/out" />
+ <excludeFolder url="file://$MODULE_DIR$/samples/quickstart/build" />
+ <excludeFolder url="file://$MODULE_DIR$/samples/spring-hibernate/build" />
+ <excludeFolder url="file://$MODULE_DIR$/samples/spring/build" />
+ <excludeFolder url="file://$MODULE_DIR$/support/ehcache/build" />
+ <excludeFolder url="file://$MODULE_DIR$/support/quartz/build" />
+ <excludeFolder url="file://$MODULE_DIR$/support/spring/build" />
+ <excludeFolder url="file://$MODULE_DIR$/web/build" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
diff --git a/jsecurity.ipr b/jsecurity.ipr
index 2984199..25187c8 100644
--- a/jsecurity.ipr
+++ b/jsecurity.ipr
@@ -521,46 +521,14 @@
<component name="libraryTable">
<library name="all-libs">
<CLASSES>
- <root url="jar://$PROJECT_DIR$/lib/test/dom4j.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/test/servlet-api.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/test/junit.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/test/spring.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/test/backport-util-concurrent.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/test/ehcache.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/test/jsp-api.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/test/asm.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/test/jstl.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/test/geronimo-jta_1.0.1B_spec.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/test/commons-beanutils.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/test/retroweaver-rt.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/test/log4j.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/test/quartz.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/test/hsqldb.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/test/hibernate.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/test/docbook-libs.zip!/" />
- <root url="jar://$PROJECT_DIR$/lib/test/spring-webmvc.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/test/commons-logging.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/test/asm-util.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/test/commons-collections.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/test/asm-commons.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/test/antlr.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/test/standard.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/test/cglib.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/test/easymockclassextension.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/test/retroweaver.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/test/asm-attrs.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/test/asm-tree.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/test/easymock.jar!/" />
+ <root url="file://$PROJECT_DIR$/lib/test" />
</CLASSES>
<JAVADOC />
<SOURCES />
+ <jarDirectory url="file://$PROJECT_DIR$/lib/test" recursive="false" />
</library>
<library name="quickstart-libs">
- <CLASSES>
- <root url="jar://$PROJECT_DIR$/lib/samples/commons-logging.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/samples/ehcache.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/samples/backport-util-concurrent.jar!/" />
- </CLASSES>
+ <CLASSES />
<JAVADOC />
<SOURCES />
</library>
diff --git a/pom.xml b/pom.xml
index 0bf3113..8ca7b8b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,7 +46,8 @@
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/incubator/jsecurity/import/trunk</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/jsecurity/import/trunk</developerConnection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/jsecurity/import/trunk
+ </developerConnection>
<url>http://svn.apache.org/repos/asf/incubator/jsecurity/import/trunk</url>
</scm>
@@ -107,7 +108,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
- <version>2.5.1</version>
+ <version>2.5.6</version>
<optional>true</optional>
</dependency>
<dependency>
diff --git a/support/ehcache/build.xml b/support/ehcache/build.xml
index 2919510..a739295 100644
--- a/support/ehcache/build.xml
+++ b/support/ehcache/build.xml
@@ -5,7 +5,7 @@
<property name="root.base.dir" value="../.."/>
<property name="module.name" value="ehcache"/>
<import file="${root.base.dir}/common.ant.xml"/>
- <property name="dist.jarName" value="${project.name}-${module.name}"/>
+ <property name="dist.jarName" value="${project.name}-${module.name}-${version}"/>
<property name="dist.jar" value="${dist.dir}/${dist.jarName}.jar"/>
<path id="compile.path">
@@ -13,7 +13,7 @@
<include name="*.jar"/>
</fileset>
<fileset dir="${dist.dir}">
- <include name="${project.name}-core.jar"/>
+ <include name="${project.name}-core-${version}.jar"/>
</fileset>
</path>
diff --git a/support/quartz/build.xml b/support/quartz/build.xml
index 34259e7..9c3295e 100644
--- a/support/quartz/build.xml
+++ b/support/quartz/build.xml
@@ -5,7 +5,7 @@
<property name="root.base.dir" value="../.."/>
<property name="module.name" value="quartz"/>
<import file="${root.base.dir}/common.ant.xml"/>
- <property name="dist.jarName" value="${project.name}-${module.name}"/>
+ <property name="dist.jarName" value="${project.name}-${module.name}-${version}"/>
<property name="dist.jar" value="${dist.dir}/${dist.jarName}.jar"/>
<path id="compile.path">
@@ -13,7 +13,7 @@
<include name="*.jar"/>
</fileset>
<fileset dir="${dist.dir}">
- <include name="${project.name}-core.jar"/>
+ <include name="${project.name}-core-${version}.jar"/>
</fileset>
</path>
diff --git a/support/spring/build.xml b/support/spring/build.xml
index 38aaba3..28e2ec1 100644
--- a/support/spring/build.xml
+++ b/support/spring/build.xml
@@ -5,7 +5,7 @@
<property name="root.base.dir" value="../.."/>
<property name="module.name" value="spring"/>
<import file="${root.base.dir}/common.ant.xml"/>
- <property name="dist.jarName" value="${project.name}-${module.name}"/>
+ <property name="dist.jarName" value="${project.name}-${module.name}-${version}"/>
<property name="dist.jar" value="${dist.dir}/${dist.jarName}.jar"/>
<path id="compile.path">
@@ -13,8 +13,8 @@
<include name="*.jar"/>
</fileset>
<fileset dir="${dist.dir}">
- <include name="${project.name}-core.jar"/>
- <include name="${project.name}-web.jar"/>
+ <include name="${project.name}-core-${version}.jar"/>
+ <include name="${project.name}-web-${version}.jar"/>
</fileset>
</path>
diff --git a/web/build.xml b/web/build.xml
index 986218a..4c78ce6 100644
--- a/web/build.xml
+++ b/web/build.xml
@@ -5,7 +5,7 @@
<property name="root.base.dir" value=".."/>
<property name="module.name" value="web"/>
<import file="${root.base.dir}/common.ant.xml"/>
- <property name="dist.jarName" value="${project.name}-${module.name}"/>
+ <property name="dist.jarName" value="${project.name}-${module.name}-${version}"/>
<property name="dist.jar" value="${dist.dir}/${dist.jarName}.jar"/>
<path id="compile.path">
@@ -13,7 +13,7 @@
<include name="*.jar"/>
</fileset>
<fileset dir="${dist.dir}">
- <include name="${project.name}-core.jar"/>
+ <include name="${project.name}-core-${version}.jar"/>
</fileset>
</path>
