hammant 2003/04/27 10:27:39
Modified: . build.xml default.properties
src/conf publishing-demo-assembly.xml
publishing-demo-config.xml
src/example/org/apache/altrmi/examples/blockpublishing
AltrmiHelloWorldServerImpl.java
AltrmiHelloWorldServerImpl.xinfo
HelloWorldServerImpl.xinfo
Added: lib/optional/examples cornerstone.jar
Log:
demo sar deploys
Revision Changes Path
1.14 +11 -7 incubator-altrmi/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/incubator-altrmi/build.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- build.xml 27 Apr 2003 15:53:55 -0000 1.13
+++ build.xml 27 Apr 2003 17:27:39 -0000 1.14
@@ -579,7 +579,7 @@
<taskdef name="sar"
classname="org.apache.avalon.phoenix.tools.tasks.Sar">
<classpath refid="project.class.path"/>
- </taskdef>
+ </taskdef>
<sar sarfile="${build.lib}/publishing-demo.sar"
config="${src.dir}/conf/publishing-demo-config.xml"
@@ -590,13 +590,17 @@
<include name="publishing-helloworld.jar"/>
</lib>
+ <lib dir="lib/optional/examples">
+ <include name="cornerstone.jar"/>
+ </lib>
+
<lib dir="${build.lib}">
- <include name="altrmi-common-${altrmi.ver}.jar"/>
- <include name="altrmi-server-interfaces-${altrmi.ver}.jar"/>
- <include name="altrmi-server-impl-${altrmi.ver}.jar"/>
- <include name="altrmi-generator-${altrmi.ver}.jar"/>
- <include name="altrmi-blocks-${altrmi.ver}.jar"/>
- <include name="altrmi-registry-${altrmi.ver}.jar"/>
+ <include name="altrmi-common-${version}.jar"/>
+ <include name="altrmi-server-interfaces-${version}.jar"/>
+ <include name="altrmi-server-impl-${version}.jar"/>
+ <include name="altrmi-generator-${version}.jar"/>
+ <include name="altrmi-blocks-${version}.jar"/>
+ <include name="altrmi-registry-${version}.jar"/>
</lib>
</sar>
1.8 +1 -0 incubator-altrmi/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/incubator-altrmi/default.properties,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- default.properties 26 Apr 2003 13:05:25 -0000 1.7
+++ default.properties 27 Apr 2003 17:27:39 -0000 1.8
@@ -46,6 +46,7 @@
log4j.jar=./lib/optional/jms/log4j-1.2.7.jar
phoenix-metagenerate.jar=./lib/buildtime/phoenix-metagenerate.jar
qdox.jar=./lib/buildtime/qdox-1.0.jar
+cornerstone.jar=./lib/optional/examples/cornerstone.jar
# ----- Excalibur pool, version 1.1 or later -----
excalibur-pool.jar=./lib/optional/excalibur-pool-1.2.jar
1.2 +8 -11 incubator-altrmi/src/conf/publishing-demo-assembly.xml
Index: publishing-demo-assembly.xml
===================================================================
RCS file: /home/cvs/incubator-altrmi/src/conf/publishing-demo-assembly.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- publishing-demo-assembly.xml 27 Apr 2003 15:53:56 -0000 1.1
+++ publishing-demo-assembly.xml 27 Apr 2003 17:27:39 -0000 1.2
@@ -5,19 +5,15 @@
<assembly>
<!-- The Connection Manager block -->
- <block
class="org.apache.avalon.cornerstone.blocks.connection.DefaultConnectionManager"
- name="connections">
- <provide name="thread-manager"
-
role="org.apache.avalon.cornerstone.services.threads.ThreadManager" />
+ <block
class="org.apache.avalon.cornerstone.blocks.connection.DefaultConnectionManager"
name="connections">
+ <provide name="thread-manager"
role="org.apache.avalon.cornerstone.services.threads.ThreadManager" />
</block>
<!-- The ThreadManager block -->
- <block
class="org.apache.avalon.cornerstone.blocks.threads.DefaultThreadManager"
- name="thread-manager" />
+ <block
class="org.apache.avalon.cornerstone.blocks.threads.DefaultThreadManager"
name="thread-manager" />
<!-- The Socket Manager block -->
- <block
class="org.apache.avalon.cornerstone.blocks.sockets.DefaultSocketManager"
- name="sockets" />
+ <block
class="org.apache.avalon.cornerstone.blocks.sockets.DefaultSocketManager"
name="sockets" />
<!-- -->
<!-- Below is publication and publication -->
@@ -36,12 +32,13 @@
<!-- Below this section are the demo blocks -->
<!-- -->
- <block
class="org.apache.altrmi.examples.blockpublisher.HelloWorldServerImpl"
name="helloworldserver" >
+ <block
class="org.apache.altrmi.examples.blockpublishing.HelloWorldServerImpl"
name="helloworldserver" >
<!-- needs nothing -->
</block>
- <block
class="org.apache.altrmi.examples.blockpublisher.AltrmiHelloWorldServerImpl"
name="helloworldserver-publisher">
- <provide name="helloworldserver"
role="org.apache.altrmi.examples.blockpublisher.HelloWorldServer"/>
+ <block
class="org.apache.altrmi.examples.blockpublishing.AltrmiHelloWorldServerImpl"
name="helloworldserver-publisher">
+ <provide name="helloworldserver"
role="org.apache.altrmi.examples.blockpublishing.HelloWorldServer"/>
+ <provide name="altrmi-publisher"
role="org.apache.altrmi.server.Publisher"/>
</block>
</assembly>
1.2 +4 -1 incubator-altrmi/src/conf/publishing-demo-config.xml
Index: publishing-demo-config.xml
===================================================================
RCS file: /home/cvs/incubator-altrmi/src/conf/publishing-demo-config.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- publishing-demo-config.xml 27 Apr 2003 15:53:56 -0000 1.1
+++ publishing-demo-config.xml 27 Apr 2003 17:27:39 -0000 1.2
@@ -33,7 +33,10 @@
<helloworldserver/>
- <helloworldserver-publisher/>
+ <helloworldserver-publisher>
+ <pub-name>helloworld</pub-name>
+ </helloworldserver-publisher>
+
<altrmi-publisher>
<port>8666</port>
1.3 +1 -1
incubator-altrmi/src/example/org/apache/altrmi/examples/blockpublishing/AltrmiHelloWorldServerImpl.java
Index: AltrmiHelloWorldServerImpl.java
===================================================================
RCS file:
/home/cvs/incubator-altrmi/src/example/org/apache/altrmi/examples/blockpublishing/AltrmiHelloWorldServerImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AltrmiHelloWorldServerImpl.java 27 Apr 2003 15:53:56 -0000 1.2
+++ AltrmiHelloWorldServerImpl.java 27 Apr 2003 17:27:39 -0000 1.3
@@ -86,7 +86,7 @@
*/
public class AltrmiHelloWorldServerImpl
extends AbstractLogEnabled
- implements Serviceable, Configurable, Initializable
+ implements Serviceable, Configurable, Initializable,
AltrmiHelloWorldServer
{
private HelloWorldServer m_helloWorldServer;
private Publisher m_publisher;
1.2 +1 -1
incubator-altrmi/src/example/org/apache/altrmi/examples/blockpublishing/AltrmiHelloWorldServerImpl.xinfo
Index: AltrmiHelloWorldServerImpl.xinfo
===================================================================
RCS file:
/home/cvs/incubator-altrmi/src/example/org/apache/altrmi/examples/blockpublishing/AltrmiHelloWorldServerImpl.xinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AltrmiHelloWorldServerImpl.xinfo 27 Apr 2003 15:53:56 -0000 1.1
+++ AltrmiHelloWorldServerImpl.xinfo 27 Apr 2003 17:27:39 -0000 1.2
@@ -14,7 +14,7 @@
<dependencies>
<dependency>
- <service name="org.apache.excalibur.altrmi.server.Publisher"/>
+ <service name="org.apache.altrmi.server.Publisher"/>
</dependency>
<dependency>
<service
name="org.apache.altrmi.examples.blockpublishing.HelloWorldServer"/>
1.2 +3 -2
incubator-altrmi/src/example/org/apache/altrmi/examples/blockpublishing/HelloWorldServerImpl.xinfo
Index: HelloWorldServerImpl.xinfo
===================================================================
RCS file:
/home/cvs/incubator-altrmi/src/example/org/apache/altrmi/examples/blockpublishing/HelloWorldServerImpl.xinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HelloWorldServerImpl.xinfo 27 Apr 2003 15:53:56 -0000 1.1
+++ HelloWorldServerImpl.xinfo 27 Apr 2003 17:27:39 -0000 1.2
@@ -9,8 +9,9 @@
<version>1.0</version>
</block>
- <!-- No services are offered by this block -->
- <services/>
+ <services>
+ <service
name="org.apache.altrmi.examples.blockpublishing.HelloWorldServer"/>
+ </services>
<dependencies>
</dependencies>
1.1 incubator-altrmi/lib/optional/examples/cornerstone.jar
<<Binary file>>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
