hammant 2003/01/02 16:21:49
Modified: demo build.xml
demo/src/conf avalon-altrmidemo-assembly.xml
demo/src/java/org/apache/avalon/apps/demos/helloworldserver
HelloWorldServerImpl.java
demo/src/xdocs demo-altrmi-helloworld.xml
Removed: demo/src/java/org/apache/avalon/apps/demos/soaphelloworldserver
SOAPHelloWorldServerImpl.java
SOAPHelloWorldServerTester.java
Log:
Altrmi bumped to 0,8. Glue demo removed (license issues)
Revision Changes Path
1.72 +14 -68 jakarta-avalon-apps/demo/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/demo/build.xml,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- build.xml 5 Nov 2002 22:29:17 -0000 1.71
+++ build.xml 3 Jan 2003 00:21:49 -0000 1.72
@@ -74,10 +74,6 @@
<!-- Compiles project -->
<target name="compile">
- <available
classname="org.apache.avalon.cornerstone.blocks.soapification.glue.Glue"
- classpathref="project.class.path"
- property="glue.soapification.present"/>
-
<mkdir dir="${build.classes}"/>
<mkdir dir="${build.dir}/genjava"/>
<mkdir dir="${build.dir}/genclasses"/>
@@ -91,9 +87,6 @@
deprecation="${build.deprecation}">
<classpath refid="project.class.path" />
- <exclude
name="org/apache/avalon/apps/demos/soaphelloworldserver/**.java"
- unless="glue.soapification.present" />
-
</javac>
<rmic base="${build.classes}"
@@ -106,10 +99,10 @@
interfaces="org.apache.avalon.apps.demos.helloworldserver.HelloWorldServer"
classgendir="build/genclasses">
<classpath>
- <pathelement
location="../common/lib/excalibur-altrmi-client-interfaces-0.7.jar"/>
- <pathelement
location="../common/lib/excalibur-altrmi-client-impl-0.7.jar"/>
- <pathelement
location="../common/lib/excalibur-altrmi-common-0.7.jar"/>
- <pathelement
location="../common/lib/excalibur-altrmi-generator-0.7.jar"/>
+ <pathelement
location="../common/lib/excalibur-altrmi-client-interfaces-0.8a.jar"/>
+ <pathelement
location="../common/lib/excalibur-altrmi-client-impl-0.8a.jar"/>
+ <pathelement
location="../common/lib/excalibur-altrmi-common-0.8a.jar"/>
+ <pathelement
location="../common/lib/excalibur-altrmi-generator-0.8a.jar"/>
<pathelement path="${build.classes}"/>
</classpath>
</altrmiproxies>
@@ -157,15 +150,6 @@
</fileset>
</jar>
- <jar jarfile="${build.lib}/demo-soaphelloworld.jar"
- basedir="${build.classes}">
- <include name="org/apache/avalon/apps/demos/soaphelloworldserver/*"/>
- <fileset dir="${build.metagenerate}">
- <include
name="org/apache/avalon/apps/demos/soaphelloworldserver/*.xinfo"/>
- <include
name="org/apache/avalon/apps/demos/soaphelloworldserver/*.mxinfo"/>
- </fileset>
- </jar>
-
<jar jarfile="${build.lib}/demo-rmihelloworld.jar"
basedir="${build.classes}">
<include name="org/apache/avalon/apps/demos/rmihelloworldserver/*"/>
@@ -204,9 +188,9 @@
</jar>
<mkdir dir="build/temp"/>
- <unzip src="../common/lib/excalibur-altrmi-common-0.7.jar"
dest="build/temp" />
- <unzip src="../common/lib/excalibur-altrmi-client-interfaces-0.7.jar"
dest="build/temp" />
- <unzip src="../common/lib/excalibur-altrmi-client-impl-0.7.jar"
dest="build/temp" />
+ <unzip src="../common/lib/excalibur-altrmi-common-0.8a.jar"
dest="build/temp" />
+ <unzip src="../common/lib/excalibur-altrmi-client-interfaces-0.8a.jar"
dest="build/temp" />
+ <unzip src="../common/lib/excalibur-altrmi-client-impl-0.8a.jar"
dest="build/temp" />
<jar jarfile="${build.lib}/avalon-altrmidemo-tester.jar"
compress="false" manifest="${manifest.dir}/AltrmiHelloWorldTest.mf">
<fileset dir="build/genclasses">
@@ -230,7 +214,7 @@
<target name="main" depends="sars" description="Default target to generate
build products minus docs"/>
<target name="all" depends="main,docs" description="Generate build
products including docs"/>
- <target name="sars" depends="jars, demo-sar, soapdemo-sar, rmidemo-sar,
altrmidemo-sar, lifecycledemo-sar" description="Create SARs">
+ <target name="sars" depends="jars, demo-sar, rmidemo-sar, altrmidemo-sar,
lifecycledemo-sar" description="Create SARs">
<mkdir dir="dist"/>
@@ -262,35 +246,6 @@
</target>
- <target name="soapdemo-sar" depends="jars" if="glue.soapification.present"
description="Create the SOAP demo SAR">
-
- <sar sarfile="${build.lib}/avalon-soapdemo.sar"
- config="${conf.dir}/avalon-gluedemo-config.xml"
- environment="${conf.dir}/avalon-gluedemo-environment.xml"
- assembly="${conf.dir}/avalon-gluedemo-assembly.xml" >
-
- <lib dir="${build.lib}/">
- <include name="demo-helloworld.jar"/>
- <include name="demo-soaphelloworld.jar"/>
- </lib>
-
- <lib dir="../common/lib">
- <include name="cornerstone.jar"/>
- </lib>
-
- <lib dir="lib">
- <include name="GLUE-STD.jar"/>
- <include name="jndi.jar"/>
- <include name="ejb.jar"/>
- <include name="servlet.jar"/>
- <include name="jcert.jar"/>
- <include name="jnet.jar"/>
- <include name="jsse.jar"/>
- </lib>
- </sar>
-
- </target>
-
<target name="rmidemo-sar" depends="jars" description="Create the RMI demo
SAR">
<sar sarfile="${build.lib}/avalon-rmidemo.sar"
@@ -327,10 +282,12 @@
</lib>
<lib dir="../common/lib">
- <include name="excalibur-altrmi-common-0.7.jar"/>
- <include name="excalibur-altrmi-server-interfaces-0.7.jar"/>
- <include name="excalibur-altrmi-server-impl-0.7.jar"/>
- <include name="excalibur-altrmi-generator-0.7.jar"/>
+ <include name="excalibur-altrmi-common-0.8a.jar"/>
+ <include name="excalibur-altrmi-server-interfaces-0.8a.jar"/>
+ <include name="excalibur-altrmi-server-impl-0.8a.jar"/>
+ <include name="excalibur-altrmi-generator-0.8a.jar"/>
+ <include name="excalibur-altrmi-blocks-0.8a.jar"/>
+ <include name="excalibur-altrmi-registry-0.8a.jar"/>
</lib>
<fileset dir="${build.lib}">
@@ -361,16 +318,6 @@
<target name="check" depends="compile" description="Perform any built in
tests">
</target>
- <!-- Performs soap related unit tests -->
- <target name="check-soap" depends="compile"
if="glue.soapification.present">
- <java
classname="org.apache.avalon.apps.demos.soaphelloworldserver.SOAPHelloWorldServerTester">
- <classpath refid="project.class.path" />
- </java>
- </target>
-
- <!-- Performs unit tests -->
- <target name="soap-demo-test" depends="check-soap" description="Change the
HelloWorld message via the SOAP API (a test aid)"/>
-
<!-- Performs rmi related unit tests -->
<target name="check-rmi" depends="compile">
<java
classname="org.apache.avalon.apps.demos.rmihelloworldserver.RMIHelloWorldClient">
@@ -476,7 +423,6 @@
<fileset dir="${build.docs}"/>
</copy>
- <!-- Not allowed to distribute glue thus no soapdemo jar -->
<copy file="${build.lib}/avalon-demo.sar"
tofile="${bin.dist.dir}/avalon-demo-${version}.sar"/>
<copy file="${build.lib}/avalon-lifecycledemo.sar"
tofile="${bin.dist.dir}/avalon-lifecycledemo-${version}.sar"/>
<copy file="${build.lib}/avalon-altrmidemo.sar"
tofile="${bin.dist.dir}/avalon-altrmidemo-${version}.sar"/>
1.12 +3 -3
jakarta-avalon-apps/demo/src/conf/avalon-altrmidemo-assembly.xml
Index: avalon-altrmidemo-assembly.xml
===================================================================
RCS file:
/home/cvs/jakarta-avalon-apps/demo/src/conf/avalon-altrmidemo-assembly.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- avalon-altrmidemo-assembly.xml 7 Sep 2002 00:07:32 -0000 1.11
+++ avalon-altrmidemo-assembly.xml 3 Jan 2003 00:21:49 -0000 1.12
@@ -24,14 +24,14 @@
<!-- -->
- <listener
class="org.apache.avalon.cornerstone.blocks.transport.autopublishing.AutoPublisher"
+ <listener
class="org.apache.excalibur.altrmi.blocks.autopublishing.AutoPublisher"
name="altrmification-listener"/>
- <block
class="org.apache.avalon.cornerstone.blocks.transport.authentication.DefaultAuthenticator"
+ <block
class="org.apache.excalibur.altrmi.blocks.authentication.DefaultAuthenticator"
name="altrmi-authenticator" >
</block>
- <block
class="org.apache.avalon.cornerstone.blocks.transport.publishing.SocketStreamPublisher"
+ <block
class="org.apache.excalibur.altrmi.blocks.publishing.SocketStreamPublisher"
name="altrmi-publisher" >
<provide name="sockets"
role="org.apache.avalon.cornerstone.services.sockets.SocketManager"/>
<provide name="connections"
1.14 +1 -1
jakarta-avalon-apps/demo/src/java/org/apache/avalon/apps/demos/helloworldserver/HelloWorldServerImpl.java
Index: HelloWorldServerImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-apps/demo/src/java/org/apache/avalon/apps/demos/helloworldserver/HelloWorldServerImpl.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- HelloWorldServerImpl.java 1 Jan 2003 20:49:51 -0000 1.13
+++ HelloWorldServerImpl.java 3 Jan 2003 00:21:49 -0000 1.14
@@ -82,7 +82,7 @@
{
throw new ConfigurationException( "Malformed bind parameter",
unhe );
}
- String test = configuration.getChild("test").getValue();
+ //String test = configuration.getChild("test").getValue();
}
/**
1.3 +5 -5
jakarta-avalon-apps/demo/src/xdocs/demo-altrmi-helloworld.xml
Index: demo-altrmi-helloworld.xml
===================================================================
RCS file:
/home/cvs/jakarta-avalon-apps/demo/src/xdocs/demo-altrmi-helloworld.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- demo-altrmi-helloworld.xml 1 Jan 2003 20:04:31 -0000 1.2
+++ demo-altrmi-helloworld.xml 3 Jan 2003 00:21:49 -0000 1.3
@@ -51,14 +51,14 @@
</p>
<source>
(text snipped)
- <listener
class="org.apache.avalon.cornerstone.blocks.transport.autopublishing.AutoPublisher"
+ <listener
class="org.apache.excalibur.altrmi.blocks.autopublishing.AutoPublisher"
name="altrmification-listener"/>
- <block
class="org.apache.avalon.cornerstone.blocks.transport.authentication.DefaultAuthenticator"
+ <block
class="org.apache.excalibur.altrmi.blocks.authentication.DefaultAuthenticator"
name="altrmi-authenticator" >
</block>
- <block
class="org.apache.avalon.cornerstone.blocks.transport.publishing.SocketStreamPublisher"
+ <block
class="org.apache.excalibur.altrmi.blocks.publishing.SocketStreamPublisher"
name="altrmi-publisher" >
<provide name="sockets"
role="org.apache.avalon.cornerstone.services.sockets.SocketManager"/>
<provide name="connections"
@@ -103,7 +103,7 @@
(text snipped)
</source>
<p>
- The autopublisher and publisher onfiguration are here.
+ The autopublisher and publisher configuration are here.
</p>
</s1>
</body>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
