User: starksm
Date: 01/07/14 14:23:13
Modified: src/build/subprojects Tag: Branch_2_4 build-perf.xml
build-security.xml
Log:
Clean up inclusion of resources into deployment jars
Revision Changes Path
No revision
No revision
1.1.2.2 +22 -3 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.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- build-perf.xml 2001/07/09 01:06:01 1.1.2.1
+++ build-perf.xml 2001/07/14 21:23:13 1.1.2.2
@@ -24,9 +24,8 @@
<!-- =================================================================== -->
<target name="jar" depends="compile">
<delete dir="${build.classes.dir}/META-INF"/>
- <copy todir="${build.classes.dir}">
- <fileset dir="${src.resources}/perf"/>
- </copy>
+ <mkdir dir="${build.classes.dir}/META-INF"/>
+ <copy todir="${build.classes.dir}/META-INF"
file="${src.resources}/perf/META-INF/ejb-jar.xml"/>
<jar jarfile="${build.lib.dir}/perftest.jar"
basedir="${build.classes.dir}"
manifest="${etc.dir}/manifest.mf"
@@ -38,6 +37,26 @@
<include name="org/jboss/test/perf/interfaces/**" />
<include name="org/jboss/test/util/ejb/**" />
<include name="META-INF/**" />
+ </jar>
+
+
+ <delete dir="${build.classes.dir}/META-INF"/>
+ <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" />
</jar>
</target>
1.2.2.1 +12 -6 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.2.2.1
diff -u -r1.2 -r1.2.2.1
--- build-security.xml 2001/06/13 04:53:14 1.2
+++ build-security.xml 2001/07/14 21:23:13 1.2.2.1
@@ -41,8 +41,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" />
+ <fileset dir="${src.resources}/security">
+ <include name="users.properties" />
+ <include name="roles.properties" />
+ </fileset>
</jar>
<!-- Build the security-spec.jar -->
@@ -56,8 +58,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" />
+ <fileset dir="${src.resources}/security">
+ <include name="users.properties" />
+ <include name="roles.properties" />
+ </fileset>
</jar>
<!-- Build the security-proxy.jar -->
@@ -78,8 +82,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
