User: starksm
Date: 01/04/04 14:16:13
Modified: src/build build.bat build.sh build.xml
Log:
Reorganize the jar contents so that the NestableGroup and NestablePrincipal
are available to custom login modules and clients.
Revision Changes Path
1.2 +1 -1 jbosssx/src/build/build.bat
Index: build.bat
===================================================================
RCS file: /cvsroot/jboss/jbosssx/src/build/build.bat,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.bat 2001/03/05 09:53:23 1.1
+++ build.bat 2001/04/04 21:16:13 1.2
@@ -5,7 +5,7 @@
REM convenience bat file to build with
set CP=..\..\lib\ant.jar
set CP=%CP%;..\..\lib\jaxp.jar
-set CP=%CP%;..\..\lib\parser.jar
+set CP=%CP%;..\..\lib\crimson.jar
set CP=%CP%;..\..\lib\javac.jar
java -classpath "%CP%" org.apache.tools.ant.Main %1 %2 %3 %4 %5
1.2 +1 -1 jbosssx/src/build/build.sh
Index: build.sh
===================================================================
RCS file: /cvsroot/jboss/jbosssx/src/build/build.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.sh 2001/03/05 09:53:23 1.1
+++ build.sh 2001/04/04 21:16:13 1.2
@@ -4,7 +4,7 @@
CP=../../lib/ant.jar
CP=$CP:../../lib/jaxp.jar
-CP=$CP:../../lib/parser.jar
+CP=$CP:../../lib/crimson.jar
CP=$CP:../../lib/javac.jar
java -classpath "$CP" org.apache.tools.ant.Main $*
1.2 +136 -59 jbosssx/src/build/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosssx/src/build/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.xml 2001/03/05 09:53:23 1.1
+++ build.xml 2001/04/04 21:16:13 1.2
@@ -1,25 +1,29 @@
<!-- An ant build file for JBossSX security framework
@author [EMAIL PROTECTED]
-@version $Revision: 1.1 $
+@version $Revision: 1.2 $
-->
<project name="JBossSX" default="jar" basedir="../../">
<!-- The location of the JBoss server dist tree. This is
- used to access the lib/ext/jboss.jar
- as there is no jboss-spi.jar
+ used to access the lib/ext/jboss.jar
+ as there is no jboss-spi.jar
-->
<property name="jboss.dist" value="../jboss/dist" />
+ <property name="jboss.client" value="../jboss/dist/client" />
<property name="lib.dir" value="lib" />
<property name="build.dir" value="build"/>
<property name="build.classes.dir" value="build/classes"/>
<property name="build.lib.dir" value="${build.dir}/lib"/>
+ <property name="build.examples.dir" value="${build.dir}/examples"/>
<property name="dist.dir" value="dist"/>
<property name="conf.dir" value="${dist.dir}/conf/default"/>
<property name="etc.dir" value="${basedir}/src/etc"/>
<property name="src.dir" value="${basedir}/src/main"/>
- <target name="prepare">
+ <target name="init">
+ <available property="junit.present" classname="junit.framework.TestCase" />
<mkdir dir="${build.dir}"/>
- <mkdir dir="${build.classes.dir}"/>
+ <mkdir dir="${build.classes.dir}"/>
+ <mkdir dir="${build.examples.dir}"/>
<mkdir dir="${build.lib.dir}"/>
<mkdir dir="${dist.dir}"/>
</target>
@@ -33,14 +37,14 @@
<pathelement path="${lib.dir}/jdbc2_0-stdext.jar" />
<pathelement path="${lib.dir}/jmxri.jar" />
<pathelement path="${lib.dir}/jta-spec1_0_1.jar" />
- <pathelement path="${lib.dir}/parser.jar" />
+ <pathelement path="${lib.dir}/crimson.jar" />
<pathelement path="${lib.dir}/junit.jar" />
<pathelement path="${lib.dir}/log4j.jar" />
<pathelement path="${jboss.dist}/lib/ext/jboss.jar" />
</path>
<!-- Compile the security framework code -->
- <target name="compile" depends="prepare">
+ <target name="compile" depends="init">
<!-- Compile everything into build/classes -->
<javac srcdir="${src.dir}"
destdir="${build.classes.dir}"
@@ -48,8 +52,8 @@
>
<classpath refid="base.path" />
<include name="org/jboss/**" />
- <!-- Exclude test which depend on JBoss core code -->
- <exclude name="org/jboss/test/TstTimedCache*" />
+ <!-- Exclude tests -->
+ <exclude name="org/jboss/test/**" />
</javac>
<!-- Generate the RMI stub for the SRPRemoteServer -->
@@ -58,62 +62,87 @@
/>
</target>
+ <!-- Compile the security framework and test code -->
+ <target name="compile-all" depends="init">
+ <!-- Compile everything into build/classes -->
+ <javac srcdir="${src.dir}"
+ destdir="${build.classes.dir}"
+ debug="on"
+ >
+ <classpath>
+ <path refid="base.path" />
+ <pathelement path="${jboss.dist}/lib/ext/jnpserver.jar" />
+ </classpath>
+ <include name="org/jboss/**" />
+ </javac>
+ <!-- Generate the RMI stub for the SRPRemoteServer -->
+ <rmic stubversion="1.2" base="${build.classes.dir}"
+ classname="org.jboss.security.srp.SRPRemoteServer"
+ />
+ </target>
+
<!-- Create the JBossSX jars -->
<target name="jar" depends="compile">
<!-- The jbosssx.jar -->
<jar jarfile="${build.lib.dir}/jbosssx.jar"
- basedir="${build.classes.dir}"
- >
+ basedir="${build.classes.dir}"
+ >
<include name="org/jboss/**" />
<!-- Exclude the JAAS 1.0x LoginModule and related classes that
have to be on the classspath due to class loader limitations in
JAAS.
-->
- <exclude name="org/jboss/security/ClientLoginModule.class" />
- <exclude name="org/jboss/security/SecurityAssociation.class" />
- <exclude name="org/jboss/security/SimpleGroup.class" />
- <exclude name="org/jboss/security/SimplePrincipal.class" />
- <exclude name="org/jboss/security/plugins/AbstractServerLoginModule.class"
/>
- <exclude name="org/jboss/security/plugins/ProxyLoginModule.class" />
- <exclude name="org/jboss/security/plugins/samples/*LoginModule.class" />
- <exclude name="org/jboss/security/Util.class" />
- <exclude name="org/jboss/security/srp/SRPClientSession.class" />
- <exclude name="org/jboss/security/srp/SRPServerInterface*.class" />
- <exclude name="org/jboss/security/srp/jaas/SRPLoginModule.class" />
- </jar>
+ <exclude name="org/jboss/security/ClientLoginModule.class" />
+ <exclude name="org/jboss/security/NestableGroup*.class" />
+ <exclude name="org/jboss/security/NestablePrincipal*.class" />
+ <exclude name="org/jboss/security/SecurityAssociation.class" />
+ <exclude name="org/jboss/security/SimpleGroup.class" />
+ <exclude name="org/jboss/security/SimplePrincipal.class" />
+ <exclude
name="org/jboss/security/plugins/AbstractServerLoginModule.class" />
+ <exclude name="org/jboss/security/plugins/ProxyLoginModule.class" />
+ <exclude name="org/jboss/security/plugins/samples/*LoginModule.class" />
+ <exclude name="org/jboss/security/Util.class" />
+ <exclude name="org/jboss/security/srp/SRPClientSession.class" />
+ <exclude name="org/jboss/security/srp/SRPServerInterface*.class" />
+ <exclude name="org/jboss/security/srp/jaas/SRPLoginModule.class" />
+ </jar>
+
<!-- The jboss-jaas.jar, the compliment of jbosssx.jar -->
<jar jarfile="${build.lib.dir}/jboss-jaas.jar"
- basedir="${build.classes.dir}"
- >
- <include name="org/jboss/security/ClientLoginModule.class" />
- <include name="org/jboss/security/SecurityAssociation.class" />
- <include name="org/jboss/security/SimpleGroup.class" />
- <include name="org/jboss/security/SimplePrincipal.class" />
- <include name="org/jboss/security/plugins/AbstractServerLoginModule.class"
/>
- <include name="org/jboss/security/plugins/ProxyLoginModule.class" />
- <include name="org/jboss/security/plugins/samples/*LoginModule.class" />
- <include name="org/jboss/security/Util.class" />
- <include name="org/jboss/security/srp/SRPClientSession.class" />
- <include name="org/jboss/security/srp/SRPServerInterface*.class" />
- <include name="org/jboss/security/srp/jaas/SRPLoginModule.class" />
-
- </jar>
+ basedir="${build.classes.dir}"
+ >
+ <include name="org/jboss/security/ClientLoginModule.class" />
+ <include name="org/jboss/security/NestableGroup*.class" />
+ <include name="org/jboss/security/NestablePrincipal*.class" />
+ <include name="org/jboss/security/SecurityAssociation.class" />
+ <include name="org/jboss/security/SimpleGroup.class" />
+ <include name="org/jboss/security/SimplePrincipal.class" />
+ <include
name="org/jboss/security/plugins/AbstractServerLoginModule.class" />
+ <include name="org/jboss/security/plugins/ProxyLoginModule.class" />
+ <include name="org/jboss/security/plugins/samples/*LoginModule.class" />
+ <include name="org/jboss/security/Util.class" />
+ <include name="org/jboss/security/srp/SRPClientSession.class" />
+ <include name="org/jboss/security/srp/SRPServerInterface*.class" />
+ <include name="org/jboss/security/srp/jaas/SRPLoginModule.class" />
+ </jar>
<!-- The jbosssx-client.jar, a subset of jboss-jaas.jar -->
<jar jarfile="${build.lib.dir}/jbosssx-client.jar"
- basedir="${build.classes.dir}"
- >
- <include name="org/jboss/security/ClientLoginModule.class" />
- <include name="org/jboss/security/SecurityAssociation.class" />
- <include name="org/jboss/security/SimpleGroup.class" />
- <include name="org/jboss/security/SimplePrincipal.class" />
- <include name="org/jboss/security/Util.class" />
- <include name="org/jboss/security/srp/PkgCategory.class" />
- <include name="org/jboss/security/srp/TracePriority.class" />
- <include name="org/jboss/security/srp/SRPClientSession.class" />
- <include name="org/jboss/security/srp/SRPServerInterface*.class" />
- <include name="org/jboss/security/srp/jaas/SRPLoginModule.class" />
- </jar>
+ basedir="${build.classes.dir}"
+ >
+ <include name="org/jboss/security/ClientLoginModule.class" />
+ <include name="org/jboss/security/NestableGroup*.class" />
+ <include name="org/jboss/security/NestablePrincipal*.class" />
+ <include name="org/jboss/security/SecurityAssociation.class" />
+ <include name="org/jboss/security/SimpleGroup.class" />
+ <include name="org/jboss/security/SimplePrincipal.class" />
+ <include name="org/jboss/security/Util.class" />
+ <include name="org/jboss/security/srp/PkgCategory.class" />
+ <include name="org/jboss/security/srp/TracePriority.class" />
+ <include name="org/jboss/security/srp/SRPClientSession.class" />
+ <include name="org/jboss/security/srp/SRPServerInterface*.class" />
+ <include name="org/jboss/security/srp/jaas/SRPLoginModule.class" />
+ </jar>
</target>
<!-- Create the JBoss dist elements -->
@@ -123,24 +152,72 @@
<mkdir dir="${dist.dir}/lib" />
<mkdir dir="${dist.dir}/lib/ext" />
<mkdir dir="${dist.dir}/conf/default" />
- <copy file="${build.lib.dir}/jbosssx-client.jar" todir="${dist.dir}/client" />
- <copy file="${build.lib.dir}/jboss-jaas.jar" todir="${dist.dir}/lib" />
- <copy file="${build.lib.dir}/jbosssx.jar" todir="${dist.dir}/lib/ext" />
- <copy todir="${dist.dir}/conf/default">
+ <copy file="${build.lib.dir}/jbosssx-client.jar" todir="${dist.dir}/client"
/>
+ <copy file="${build.lib.dir}/jboss-jaas.jar" todir="${dist.dir}/lib" />
+ <copy file="${build.lib.dir}/jbosssx.jar" todir="${dist.dir}/lib/ext" />
+ <copy todir="${dist.dir}/conf/default">
<fileset dir="${etc.dir}/conf/default" />
</copy>
-
</target>
<target name="install" depends="jar">
- <copy file="${build.lib.dir}/jbosssx-client.jar" todir="${jboss.dist}/client"
/>
- <copy file="${build.lib.dir}/jboss-jaas.jar" todir="${jboss.dist}/lib" />
- <copy file="${build.lib.dir}/jbosssx.jar" todir="${jboss.dist}/lib/ext" />
+ <copy file="${build.lib.dir}/jbosssx-client.jar"
todir="${jboss.dist}/client" />
+ <copy file="${build.lib.dir}/jboss-jaas.jar" todir="${jboss.dist}/lib" />
+ <copy file="${build.lib.dir}/jbosssx.jar" todir="${jboss.dist}/lib/ext" />
</target>
+ <!-- Create the examples jars -->
+ <target name="examples" depends="init">
+ <!-- Compile everything into build/classes -->
+ <javac srcdir="${src.dir}"
+ destdir="${build.classes.dir}"
+ debug="on"
+ >
+ <classpath refid="base.path">
+ </classpath>
+ <include name="examples/**" />
+ </javac>
+
+ <!-- The secureorder.jar -->
+ <delete dir="${build.classes.dir}/META-INF" />
+ <mkdir dir="${build.classes.dir}/META-INF" />
+ <copy todir="${build.classes.dir}/META-INF" flatten="yes">
+ <fileset dir="${src.dir}">
+ <include name="examples/srp/secureorder/ejb/*.xml" />
+ </fileset>
+ </copy>
+ <jar jarfile="${build.examples.dir}/secureorder.jar"
+ basedir="${build.classes.dir}"
+ >
+ <include name="META-INF/*" />
+ <include name="examples/srp/secureorder/interfaces/*" />
+ <include name="examples/srp/secureorder/ejb/*" />
+ <exclude name="examples/srp/secureorder/ejb/*.xml" />
+ </jar>
+ </target>
+
+ <!-- Run the JBossSX unit test cases -->
+ <target name="unit-tests" depends="compile-all">
+ <junit printsummary="no" haltonfailure="yes" fork="true"
+ dir="${build.classes.dir}" timeout="120000"
+ >
+ <classpath>
+ <path refid="base.path" />
+ </classpath>
+
+ <formatter type="plain" usefile="false" />
+
+ <batchtest>
+ <fileset dir="${src.dir}">
+ <include name="org/jboss/test/*Test.java" />
+ </fileset>
+ </batchtest>
+
+ </junit>
+ </target>
+
<target name="clean">
<delete dir="${dist.dir}" />
<delete dir="${build.dir}" />
</target>
</project>
-
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development
