You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shiro.apache.org by lh...@apache.org on 2009/01/23 04:37:16 UTC
svn commit: r736898 - in /incubator/jsecurity/trunk: build.xml
samples/spring/build.xml
Author: lhazlewood
Date: Thu Jan 22 19:37:16 2009
New Revision: 736898
URL: http://svn.apache.org/viewvc?rev=736898&view=rev
Log:
upgraded ivy to 2.0.0 (final) now that it has been released. Continuing to work to enable samples builds
Modified:
incubator/jsecurity/trunk/build.xml
incubator/jsecurity/trunk/samples/spring/build.xml
Modified: incubator/jsecurity/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/build.xml?rev=736898&r1=736897&r2=736898&view=diff
==============================================================================
--- incubator/jsecurity/trunk/build.xml (original)
+++ incubator/jsecurity/trunk/build.xml Thu Jan 22 19:37:16 2009
@@ -31,7 +31,7 @@
<import file="./common.ant.xml"/>
- <property name="ivy.install.version" value="2.0.0-beta2"/>
+ <property name="ivy.install.version" value="2.0.0"/>
<condition property="ivy.home" value="${env.IVY_HOME}">
<isset property="env.IVY_HOME"/>
</condition>
@@ -112,6 +112,13 @@
<ant dir="support/spring" target="${target}"/>
<echo message="Executing '${target}' for the quartz module..."/>
<ant dir="support/quartz" target="${target}"/>
+ <!-- <echo message="Executing '${target}' for the samples/spring module..."/>
+ <ant dir="samples/spring" target="${target}"/>
+ <echo message="Executing '${target}' for the samples/spring-hibernate module..."/>
+ <ant dir="samples/spring-hibernate" target="${target}"/>
+ <echo message="Executing '${target}' for the samples/web module..."/>
+ <ant dir="samples/web" target="${target}"/> -->
+
</target>
<!-- ===================================================================
Modified: incubator/jsecurity/trunk/samples/spring/build.xml
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/samples/spring/build.xml?rev=736898&r1=736897&r2=736898&view=diff
==============================================================================
--- incubator/jsecurity/trunk/samples/spring/build.xml (original)
+++ incubator/jsecurity/trunk/samples/spring/build.xml Thu Jan 22 19:37:16 2009
@@ -17,94 +17,63 @@
~ specific language governing permissions and limitations
~ under the License.
-->
-<project name="spring-sample" default="dist">
+<?xml version="1.0"?>
- <property name="root.base.dir" value="../.."/>
-
- <!-- "extend" parent build definition -->
- <import file="../../build.xml"/>
-
- <property name="module.name" value="spring"/>
- <property name="module.base.dir" value="${root.base.dir}/samples/spring"/>
- <property name="dist.jar.name" value="${project.name}-${module.name}.jar"/>
- <property name="dist.jar" value="${root.dist.dir}/${dist.jar.name}"/>
-
- <!-- Module properties -->
- <property name="dist.war.name" value="${project.name}-${module.name}.war"/>
- <property name="dist.war" value="${root.base.dir}/build/${dist.war.name}"/>
-
- <property name="dist.dir" value="${build.dir}/dist"/>
+<project name="spring" default="package">
- <!-- Deployment properties for development -->
- <property name="deploy.dir" value="${env.CATALINA_HOME}/webapps"/>
+ <property name="root.base.dir" value="../.."/>
+ <property name="module.name" value="samples-spring"/>
+ <import file="${root.base.dir}/common.ant.xml"/>
+ <property name="dist.jarName" value="${project.name}-${module.name}-${version}"/>
+ <property name="dist.jar" value="${dist.dir}/${dist.jarName}.jar"/>
<path id="compile.path">
- <fileset dir="${lib.dir}/samples" includes="**/*.jar"/>
+ <fileset dir="${lib.dir}/${module.name}">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="${dist.dir}">
+ <include name="${project.name}-core-${version}.jar"/>
+ <include name="${project.name}-web-${version}.jar"/>
+ </fileset>
</path>
<!-- ===================================================================
- - clean - clean all build remnants from this submodule
- - ==================================================================== -->
+ clean - clean all build remnants from this submodule
+ ==================================================================== -->
+ <target name="clean-deploy-dir" description="Removes the deployed war directory">
+ <echo message="cleaning ${dist.war.name} module from ${deploy.dir}"/>
+ <delete file="${deploy.dir}/${dist.war.name}"/>
+ <delete dir="${deploy.dir}/${project.name}-${module.name}"/>
+ </target>
<target name="clean" depends="clean-deploy-dir" description="Cleans the Spring build">
<echo message="cleaning ${module.name} module"/>
<delete file="${dist.war}"/>
<delete dir="${build.dir}"/>
</target>
- <target name="clean-deploy-dir" description="Removes the deployed war directory">
- <echo message="cleaning ${dist.war.name} module from ${deploy.dir}"/>
- <delete file="${deploy.dir}/${dist.war.name}"/>
- <delete dir="${deploy.dir}/${project.name}-${module.name}"/>
+ <target name="grabLogo" description="Ensures the JSecurity logo is available to the jar task for inclusion in the jar">
+ <copy todir="${classes.dir}">
+ <fileset dir="webroot">
+ <include name="logo.png"/>
+ </fileset>
+ </copy>
</target>
- <!-- ===================================================================
- - compile - compile Java source files
- - =================================================================== -->
- <target name="compile" description="Compiles the Spring sample app classes">
+ <target name="compile" depends="compile.src"/> <!-- no test classes, no need to depend on compile.test -->
- <mkdir dir="${classes.dir}"/>
- <mkdir dir="${classes.dir}/META-INF"/>
-
- <javac destdir="${classes.dir}"
- debug="${compile.debug}"
- deprecation="${compile.deprecation}"
- optimize="${compile.optimize}"
- failonerror="true"
- classpathref="compile.path">
- <src path="${src.dir}"/>
- <classpath location="${root.dist.dir}/jsecurity.jar"/>
- </javac>
-
- </target>
- <target name="jar" depends="compile" description="Creates a .jar of the Spring sample app classes">
+ <target name="jar" depends="compile,grabLogo,jar.jdk15,jar.retroweaver"
+ description="Creates a .jar of the Spring sample app classes"/>
- <mkdir dir="${dist.dir}"/>
+ <target name="war">
- <jar jarfile="${dist.dir}/jsecurity-spring-sample.jar">
- <fileset dir="${classes.dir}">
- <include name="**/*.class"/>
- </fileset>
- <fileset dir="${etc.dir}">
- <include name="*.xml"/>
- <include name="*.properties"/>
- </fileset>
- <!-- grabbing logo from webroot-->
- <fileset dir="webroot">
- <include name="logo.png"/>
- </fileset>
- <manifest>
- <attribute name="Implementation-Title"
- value="${project.name}-${module.name}"/>
- <attribute name="Implementation-Version" value="${version}"/>
- <attribute name="${project.name}-Version" value="${version}"/>
- </manifest>
- </jar>
</target>
+ <target name="package" depends="jar,war"/>
+
<!-- ===================================================================
- - dist - create distribution war (which will be used for deployment)
- - =================================================================== -->
+ dist - create distribution war (which will be used for deployment)
+ =================================================================== -->
<target name="dist" depends="compile,jar" description="Creates the sample Spring application .war">
<property name="webstart.lib.dir" value="${build.dir}/webstart"/>
@@ -144,4 +113,5 @@
<target name="deploy" depends="dist,quick-deploy"
description="Creates and deploys the sample Spring .war to Tomcat"/>
-</project>
\ No newline at end of file
+
+</project>