User: starksm
Date: 01/07/14 17:13:18
Modified: src/build/subprojects build-perf.xml build-security.xml
Log:
Clean up resource copying to avoid conflicts
Revision Changes Path
1.4 +4 -8 jbosstest/src/build/subprojects/build-perf.xml
Index: build-perf.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/src/build/subprojects/build-perf.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build-perf.xml 2001/07/14 17:15:57 1.3
+++ build-perf.xml 2001/07/15 00:13:18 1.4
@@ -44,19 +44,15 @@
<mkdir dir="${build.classes.dir}/META-INF"/>
<copy tofile="${build.classes.dir}/META-INF/ejb-jar.xml"
file="${src.resources}/perf/META-INF/secure-ejb-jar.xml"/>
<copy tofile="${build.classes.dir}/META-INF/jboss.xml"
file="${src.resources}/perf/META-INF/secure-jboss.xml"/>
- <copy todir="${build.classes.dir}">
- <fileset dir="${src.resources}/perf">
- <include name="roles.properties" />
- <include name="users.properties" />
- </fileset>
- </copy>
<jar jarfile="${build.deploy.dir}/secure-perf.jar"
basedir="${build.classes.dir}">
<include name="org/jboss/test/perf/ejb/**" />
<include name="org/jboss/test/perf/interfaces/**" />
<include name="org/jboss/test/util/ejb/**" />
<include name="META-INF/**" />
- <include name="roles.properties" />
- <include name="users.properties" />
+ <fileset dir="${src.resources}/perf">
+ <include name="roles.properties" />
+ <include name="users.properties" />
+ </fileset>
</jar>
</target>
1.3 +13 -12 jbosstest/src/build/subprojects/build-security.xml
Index: build-security.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/src/build/subprojects/build-security.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build-security.xml 2001/06/13 04:53:14 1.2
+++ build-security.xml 2001/07/15 00:13:18 1.3
@@ -23,15 +23,14 @@
<!-- =================================================================== -->
<target name="jar" depends="compile">
<delete dir="${build.classes.dir}/META-INF"/>
- <copy todir="${build.classes.dir}">
- <fileset dir="${src.resources}/security" />
- </copy>
+ <mkdir dir="${build.classes.dir}/META-INF"/>
<jar jarfile="${build.lib.dir}/security-client.jar"
basedir="${build.classes.dir}"
manifest="${etc.dir}/manifest.mf" >
<include name="org/jboss/test/security/interfaces/**" />
</jar>
+ <copy todir="${build.classes.dir}/META-INF"
file="${src.resources}/security/META-INF/ejb-jar.xml" />
<jar jarfile="${build.deploy.dir}/security.jar"
basedir="${build.classes.dir}" >
<include name="org/jboss/test/security/ejb/**" />
@@ -41,12 +40,10 @@
<include name="org/jboss/test/security/test/PermissionName*.class" />
<include name="**/ejb-jar.xml" />
<include name="**/jboss.xml" />
- <include name="users.properties" />
- <include name="roles.properties" />
</jar>
<!-- Build the security-spec.jar -->
- <move file="${build.classes.dir}/META-INF/jboss-spec.xml"
tofile="${build.classes.dir}/META-INF/jboss.xml" overwrite="true" />
+ <copy tofile="${build.classes.dir}/META-INF/jboss.xml"
file="${src.resources}/security/META-INF/jboss-spec.xml" />
<jar jarfile="${build.deploy.dir}/security-spec.jar"
basedir="${build.classes.dir}" >
<include name="org/jboss/test/security/ejb/**" />
@@ -56,14 +53,16 @@
<include name="org/jboss/test/security/test/PermissionName*.class" />
<include name="**/ejb-jar.xml" />
<include name="**/jboss.xml" />
- <include name="users.properties" />
- <include name="roles.properties" />
+ <fileset dir="${src.resources}/security">
+ <include name="users.properties" />
+ <include name="roles.properties" />
+ </fileset>
</jar>
<!-- Build the security-proxy.jar -->
- <move file="${build.classes.dir}/META-INF/ejb-jar-proxy.xml"
+ <copy file="${src.resources}/security/META-INF/ejb-jar-proxy.xml"
tofile="${build.classes.dir}/META-INF/ejb-jar.xml" overwrite="true" />
- <move file="${build.classes.dir}/META-INF/jboss-proxy.xml"
+ <copy file="${src.resources}/security/META-INF/jboss-proxy.xml"
tofile="${build.classes.dir}/META-INF/jboss.xml" overwrite="true" />
<jar jarfile="${build.deploy.dir}/security-proxy.jar"
basedir="${build.classes.dir}" >
@@ -78,8 +77,10 @@
<include name="org/jboss/test/security/proxy/SessionSecurityProxy.class" />
<include name="**/ejb-jar.xml" />
<include name="**/jboss.xml" />
- <include name="users.properties" />
- <include name="roles.properties" />
+ <fileset dir="${src.resources}/security">
+ <include name="users.properties" />
+ <include name="roles.properties" />
+ </fileset>
</jar>
<!-- Create a separate jar that contains the security proxy classes.
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development
