shiro-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lhazlew...@apache.org
Subject svn commit: r733415 - in /incubator/jsecurity/trunk: README-runtime-requirements.txt build.xml common.ant.xml core/build.xml jsecurity.iml jsecurity.ipr pom.xml support/ehcache/build.xml support/quartz/build.xml support/spring/build.xml web/build.xml
Date Sun, 11 Jan 2009 05:22:19 GMT
Author: lhazlewood
Date: Sat Jan 10 21:22:18 2009
New Revision: 733415

URL: http://svn.apache.org/viewvc?rev=733415&view=rev
Log:
remaining build modifications to match the src structure.  Appended -${version} to jar names
to allow easy upload to the central maven repository.

Modified:
    incubator/jsecurity/trunk/README-runtime-requirements.txt
    incubator/jsecurity/trunk/build.xml
    incubator/jsecurity/trunk/common.ant.xml
    incubator/jsecurity/trunk/core/build.xml
    incubator/jsecurity/trunk/jsecurity.iml
    incubator/jsecurity/trunk/jsecurity.ipr
    incubator/jsecurity/trunk/pom.xml
    incubator/jsecurity/trunk/support/ehcache/build.xml
    incubator/jsecurity/trunk/support/quartz/build.xml
    incubator/jsecurity/trunk/support/spring/build.xml
    incubator/jsecurity/trunk/web/build.xml

Modified: incubator/jsecurity/trunk/README-runtime-requirements.txt
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/README-runtime-requirements.txt?rev=733415&r1=733414&r2=733415&view=diff
==============================================================================
--- incubator/jsecurity/trunk/README-runtime-requirements.txt (original)
+++ incubator/jsecurity/trunk/README-runtime-requirements.txt Sat Jan 10 21:22:18 2009
@@ -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

Modified: incubator/jsecurity/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/build.xml?rev=733415&r1=733414&r2=733415&view=diff
==============================================================================
--- incubator/jsecurity/trunk/build.xml (original)
+++ incubator/jsecurity/trunk/build.xml Sat Jan 10 21:22:18 2009
@@ -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">

Modified: incubator/jsecurity/trunk/common.ant.xml
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/common.ant.xml?rev=733415&r1=733414&r2=733415&view=diff
==============================================================================
--- incubator/jsecurity/trunk/common.ant.xml (original)
+++ incubator/jsecurity/trunk/common.ant.xml Sat Jan 10 21:22:18 2009
@@ -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"/>

Modified: incubator/jsecurity/trunk/core/build.xml
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/build.xml?rev=733415&r1=733414&r2=733415&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/build.xml (original)
+++ incubator/jsecurity/trunk/core/build.xml Sat Jan 10 21:22:18 2009
@@ -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">

Modified: incubator/jsecurity/trunk/jsecurity.iml
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/jsecurity.iml?rev=733415&r1=733414&r2=733415&view=diff
==============================================================================
--- incubator/jsecurity/trunk/jsecurity.iml (original)
+++ incubator/jsecurity/trunk/jsecurity.iml Sat Jan 10 21:22:18 2009
@@ -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" />

Modified: incubator/jsecurity/trunk/jsecurity.ipr
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/jsecurity.ipr?rev=733415&r1=733414&r2=733415&view=diff
==============================================================================
--- incubator/jsecurity/trunk/jsecurity.ipr (original)
+++ incubator/jsecurity/trunk/jsecurity.ipr Sat Jan 10 21:22:18 2009
@@ -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>

Modified: incubator/jsecurity/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/pom.xml?rev=733415&r1=733414&r2=733415&view=diff
==============================================================================
--- incubator/jsecurity/trunk/pom.xml (original)
+++ incubator/jsecurity/trunk/pom.xml Sat Jan 10 21:22:18 2009
@@ -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>

Modified: incubator/jsecurity/trunk/support/ehcache/build.xml
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/support/ehcache/build.xml?rev=733415&r1=733414&r2=733415&view=diff
==============================================================================
--- incubator/jsecurity/trunk/support/ehcache/build.xml (original)
+++ incubator/jsecurity/trunk/support/ehcache/build.xml Sat Jan 10 21:22:18 2009
@@ -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>
 

Modified: incubator/jsecurity/trunk/support/quartz/build.xml
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/support/quartz/build.xml?rev=733415&r1=733414&r2=733415&view=diff
==============================================================================
--- incubator/jsecurity/trunk/support/quartz/build.xml (original)
+++ incubator/jsecurity/trunk/support/quartz/build.xml Sat Jan 10 21:22:18 2009
@@ -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>
 

Modified: incubator/jsecurity/trunk/support/spring/build.xml
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/support/spring/build.xml?rev=733415&r1=733414&r2=733415&view=diff
==============================================================================
--- incubator/jsecurity/trunk/support/spring/build.xml (original)
+++ incubator/jsecurity/trunk/support/spring/build.xml Sat Jan 10 21:22:18 2009
@@ -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>
 

Modified: incubator/jsecurity/trunk/web/build.xml
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/build.xml?rev=733415&r1=733414&r2=733415&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/build.xml (original)
+++ incubator/jsecurity/trunk/web/build.xml Sat Jan 10 21:22:18 2009
@@ -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>
 



Mime
View raw message