[jboss-svn-commits] JBL Code SVN: r34761 - in labs/jbossrules/trunk: drools-grid/drools-grid-remote-dir-mina/src/main and 3 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Aug 17 12:22:29 EDT 2010
Author: salaboy21
Date: 2010-08-17 12:22:28 -0400 (Tue, 17 Aug 2010)
New Revision: 34761
Added:
labs/jbossrules/trunk/src/main/assembly/drools-grid-remote-dir-mina-pre.xml
labs/jbossrules/trunk/src/main/assembly/drools-grid-remote-mina-pre.xml
Modified:
labs/jbossrules/trunk/drools-grid/drools-grid-remote-dir-mina/src/main/java/org/drools/grid/remote/directory/DirectoryServerMessageHandlerImpl.java
labs/jbossrules/trunk/drools-grid/drools-grid-remote-dir-mina/src/main/start.sh
labs/jbossrules/trunk/drools-grid/drools-grid-remote-mina/src/main/start.sh
labs/jbossrules/trunk/pom.xml
labs/jbossrules/trunk/src/main/assembly/drools-grid-remote-dir-mina.xml
labs/jbossrules/trunk/src/main/assembly/drools-grid-remote-mina.xml
labs/jbossrules/trunk/src/main/assembly/pre-bin.xml
labs/jbossrules/trunk/src/main/assembly/pre-bin_soaversion.xml
Log:
JBRULES-2618: Drools Grid Services - Improve and clean tests
- adding assemblies in parent pom
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-remote-dir-mina/src/main/java/org/drools/grid/remote/directory/DirectoryServerMessageHandlerImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-remote-dir-mina/src/main/java/org/drools/grid/remote/directory/DirectoryServerMessageHandlerImpl.java 2010-08-17 15:25:59 UTC (rev 34760)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-remote-dir-mina/src/main/java/org/drools/grid/remote/directory/DirectoryServerMessageHandlerImpl.java 2010-08-17 16:22:28 UTC (rev 34761)
@@ -48,10 +48,10 @@
SimpleCommand resultsCmnd = new SimpleCommand(cmd.getId(), SimpleCommandName.OperationResponse, null);
- session.write(new Message( msg.getSessionId(),
- msg.getResponseId(),
- msg.isAsync(),
- resultsCmnd ), null);
+// session.write(new Message( msg.getSessionId(),
+// msg.getResponseId(),
+// msg.isAsync(),
+// resultsCmnd ), null);
break;
}
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-remote-dir-mina/src/main/start.sh
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-remote-dir-mina/src/main/start.sh 2010-08-17 15:25:59 UTC (rev 34760)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-remote-dir-mina/src/main/start.sh 2010-08-17 16:22:28 UTC (rev 34761)
@@ -2,10 +2,10 @@
# build the classpath
SERVER_CLASSPATH=
-for i in `ls ./libs/*.jar`
+for i in `ls ./lib/*.jar`
do
SERVER_CLASSPATH=${SERVER_CLASSPATH}:${i}
done
# execute the server
-java -cp ".:${SERVER_CLASSPATH}" org.drools.grid.remote.directory.MinaDirectoryRunner --address 127.0.0.1 --port 9124
\ No newline at end of file
+java -cp "drools-grid-remote-mina-5.2.0.SNAPSHOT.jar:${SERVER_CLASSPATH}" org.drools.grid.remote.directory.MinaDirectoryRunner --address 127.0.0.1 --port 9124
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-remote-mina/src/main/start.sh
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-remote-mina/src/main/start.sh 2010-08-17 15:25:59 UTC (rev 34760)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-remote-mina/src/main/start.sh 2010-08-17 16:22:28 UTC (rev 34761)
@@ -2,10 +2,10 @@
# build the classpath
SERVER_CLASSPATH=
-for i in `ls ./libs/*.jar`
+for i in `ls ./lib/*.jar`
do
SERVER_CLASSPATH=${SERVER_CLASSPATH}:${i}
done
# execute the server
-java -cp ".:${SERVER_CLASSPATH}" org.drools.grid.remote.mina.MinaNodeRunner --address 127.0.0.1 --port 9123
\ No newline at end of file
+java -cp "drools-grid-remote-dir-mina-5.2.0.SNAPSHOT.jar:${SERVER_CLASSPATH}" org.drools.grid.remote.mina.MinaNodeRunner --address 127.0.0.1 --port 9123
\ No newline at end of file
Modified: labs/jbossrules/trunk/pom.xml
===================================================================
--- labs/jbossrules/trunk/pom.xml 2010-08-17 15:25:59 UTC (rev 34760)
+++ labs/jbossrules/trunk/pom.xml 2010-08-17 16:22:28 UTC (rev 34761)
@@ -370,8 +370,10 @@
<descriptor>src/main/assembly/docs.xml</descriptor>
<descriptor>src/main/assembly/javadocs.xml</descriptor>
<descriptor>src/main/assembly/install.xml</descriptor>
- <!--descriptor>src/main/assembly/drools-grid-remote-mina.xml</descriptor>
- <descriptor>src/main/assembly/drools-grid-remote-dir-mina.xml</descriptor-->
+ <descriptor>src/main/assembly/drools-grid-remote-mina-pre.xml</descriptor>
+ <descriptor>src/main/assembly/drools-grid-remote-mina.xml</descriptor>
+ <descriptor>src/main/assembly/drools-grid-remote-dir-mina-pre.xml</descriptor>
+ <descriptor>src/main/assembly/drools-grid-remote-dir-mina.xml</descriptor>
</descriptors>
</configuration>
</plugin>
@@ -461,8 +463,10 @@
<descriptor>src/main/assembly/docs_soaversion.xml</descriptor>
<descriptor>src/main/assembly/javadocs_soaversion.xml</descriptor>
<descriptor>src/main/assembly/soa.xml</descriptor>
- <!--descriptor>src/main/assembly/drools-grid-remote-mina.xml</descriptor>
- <descriptor>src/main/assembly/drools-grid-remote-dir-mina.xml</descriptor-->
+ <descriptor>src/main/assembly/drools-grid-remote-mina-pre.xml</descriptor>
+ <descriptor>src/main/assembly/drools-grid-remote-mina.xml</descriptor>
+ <descriptor>src/main/assembly/drools-grid-remote-dir-mina-pre.xml</descriptor>
+ <descriptor>src/main/assembly/drools-grid-remote-dir-mina.xml</descriptor>
</descriptors>
</configuration>
</plugin>
Added: labs/jbossrules/trunk/src/main/assembly/drools-grid-remote-dir-mina-pre.xml
===================================================================
--- labs/jbossrules/trunk/src/main/assembly/drools-grid-remote-dir-mina-pre.xml (rev 0)
+++ labs/jbossrules/trunk/src/main/assembly/drools-grid-remote-dir-mina-pre.xml 2010-08-17 16:22:28 UTC (rev 34761)
@@ -0,0 +1,44 @@
+<assembly>
+ <id>drools-grid-remote-dir-mina-pre-bin</id>
+ <formats>
+ <format>dir</format>
+ </formats>
+
+ <includeBaseDirectory>false</includeBaseDirectory>
+
+ <files>
+
+ <file>
+ <source>drools-grid/drools-grid-remote-dir-mina/src/main/start.sh</source>
+ <destName>start.sh</destName>
+ <fileMode>0755</fileMode>
+ </file>
+ </files>
+
+ <moduleSets>
+ <moduleSet>
+ <includes>
+ <include>org.drools:drools-grid-remote-dir-mina</include>
+ </includes>
+
+ <binaries>
+ <outputDirectory></outputDirectory>
+ <unpack>false</unpack>
+
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <unpack>false</unpack>
+
+ <useTransitiveDependencies>true</useTransitiveDependencies>
+ </dependencySet>
+ </dependencySets>
+ </binaries>
+
+ </moduleSet>
+
+ </moduleSets>
+
+
+
+</assembly>
Modified: labs/jbossrules/trunk/src/main/assembly/drools-grid-remote-dir-mina.xml
===================================================================
--- labs/jbossrules/trunk/src/main/assembly/drools-grid-remote-dir-mina.xml 2010-08-17 15:25:59 UTC (rev 34760)
+++ labs/jbossrules/trunk/src/main/assembly/drools-grid-remote-dir-mina.xml 2010-08-17 16:22:28 UTC (rev 34761)
@@ -1,31 +1,17 @@
+
<assembly>
- <id>drools-grid-remote-dir-mina-distro</id>
- <formats>
- <format>zip</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <!--baseDirectory>drools-grid/drools-grid-remote-dir-mina/drools-grid-remote-dir-mina-distro</baseDirectory-->
- <files>
- <file>
- <source>drools-grid/drools-grid-remote-dir-mina/target/drools-grid-remote-dir-mina-${project.version}.jar</source>
- <destName>libs/drools-grid-remote-dir-mina-${project.version}.jar</destName>
- <fileMode>0644</fileMode>
- </file>
- <file>
- <source>drools-grid/drools-grid-remote-dir-mina/src/main/start.sh</source>
- <destName>start.sh</destName>
- <fileMode>0555</fileMode>
- </file>
- </files>
- <dependencySets>
- <dependencySet>
+ <id>drools-grid-remote-dir-mina-distro</id>
+ <formats>
+ <format>zip</format>
+ </formats>
- <outputDirectory>libs/</outputDirectory>
- <includes>
- <include>org.drools:drools-grid-remote-dir-mina:${project.version}:jar</include>
- </includes>
+ <includeBaseDirectory>false</includeBaseDirectory>
- <scope>runtime</scope>
- </dependencySet>
- </dependencySets>
+ <fileSets>
+
+ <fileSet>
+ <directory>target/drools-${project.version}-drools-grid-remote-dir-mina-pre-bin</directory>
+ <outputDirectory></outputDirectory>
+ </fileSet>
+ </fileSets>
</assembly>
Added: labs/jbossrules/trunk/src/main/assembly/drools-grid-remote-mina-pre.xml
===================================================================
--- labs/jbossrules/trunk/src/main/assembly/drools-grid-remote-mina-pre.xml (rev 0)
+++ labs/jbossrules/trunk/src/main/assembly/drools-grid-remote-mina-pre.xml 2010-08-17 16:22:28 UTC (rev 34761)
@@ -0,0 +1,45 @@
+
+<assembly>
+ <id>drools-grid-remote-mina-pre-bin</id>
+ <formats>
+ <format>dir</format>
+ </formats>
+
+ <includeBaseDirectory>false</includeBaseDirectory>
+
+ <files>
+
+ <file>
+ <source>drools-grid/drools-grid-remote-mina/src/main/start.sh</source>
+ <destName>start.sh</destName>
+ <fileMode>0755</fileMode>
+ </file>
+ </files>
+
+ <moduleSets>
+ <moduleSet>
+ <includes>
+ <include>org.drools:drools-grid-remote-mina</include>
+ </includes>
+
+ <binaries>
+ <outputDirectory></outputDirectory>
+ <unpack>false</unpack>
+
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <unpack>false</unpack>
+
+ <useTransitiveDependencies>true</useTransitiveDependencies>
+ </dependencySet>
+ </dependencySets>
+ </binaries>
+
+ </moduleSet>
+
+ </moduleSets>
+
+
+
+</assembly>
Modified: labs/jbossrules/trunk/src/main/assembly/drools-grid-remote-mina.xml
===================================================================
--- labs/jbossrules/trunk/src/main/assembly/drools-grid-remote-mina.xml 2010-08-17 15:25:59 UTC (rev 34760)
+++ labs/jbossrules/trunk/src/main/assembly/drools-grid-remote-mina.xml 2010-08-17 16:22:28 UTC (rev 34761)
@@ -1,33 +1,17 @@
+
<assembly>
- <id>drools-grid-remote-mina-distro</id>
- <formats>
- <format>zip</format>
- </formats>
+ <id>drools-grid-remote-mina-distro</id>
+ <formats>
+ <format>zip</format>
+ </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <!--baseDirectory>drools-grid/drools-grid-remote-mina/drools-grid-remote-mina-distro</baseDirectory-->
- <files>
- <file>
- <source>drools-grid/drools-grid-remote-mina/target/drools-grid-remote-mina-${project.version}.jar</source>
- <destName>libs/drools-grid-remote-mina-${project.version}.jar</destName>
- <fileMode>0644</fileMode>
- </file>
- <file>
- <source>drools-grid/drools-grid-remote-mina/src/main/start.sh</source>
- <destName>start.sh</destName>
- <fileMode>0555</fileMode>
- </file>
- </files>
+ <includeBaseDirectory>false</includeBaseDirectory>
+
+ <fileSets>
-
-
- <dependencySets>
- <dependencySet>
- <outputDirectory>libs/</outputDirectory>
- <scope>runtime</scope>
- <includes>
- <include>org.drools:drools-grid-remote-mina:${project.version}:jar</include>
- </includes>
- </dependencySet>
- </dependencySets>
+ <fileSet>
+ <directory>target/drools-${project.version}-drools-grid-remote-mina-pre-bin</directory>
+ <outputDirectory></outputDirectory>
+ </fileSet>
+ </fileSets>
</assembly>
Modified: labs/jbossrules/trunk/src/main/assembly/pre-bin.xml
===================================================================
--- labs/jbossrules/trunk/src/main/assembly/pre-bin.xml 2010-08-17 15:25:59 UTC (rev 34760)
+++ labs/jbossrules/trunk/src/main/assembly/pre-bin.xml 2010-08-17 16:22:28 UTC (rev 34761)
@@ -38,8 +38,7 @@
<include>org.drools:drools-doc</include>
<include>org.drools:drools-camel</include>
<include>org.drools:drools-bpmn2</include>
- <include>org.drools:drools-simulator</include>
- <include>org.drools:drools-grid-core</include>
+ <include>org.drools:drools-simulator</include>
<include>org.drools:drools-workitems</include>
<include>org.drools:drools-process-task</include>
<include>org.drools:drools-persistence-jpa</include>
Modified: labs/jbossrules/trunk/src/main/assembly/pre-bin_soaversion.xml
===================================================================
--- labs/jbossrules/trunk/src/main/assembly/pre-bin_soaversion.xml 2010-08-17 15:25:59 UTC (rev 34760)
+++ labs/jbossrules/trunk/src/main/assembly/pre-bin_soaversion.xml 2010-08-17 16:22:28 UTC (rev 34761)
@@ -38,7 +38,6 @@
<include>org.drools:drools-doc</include>
<include>org.drools:drools-camel</include>
<include>org.drools:drools-bpmn2</include>
- <include>org.drools:drools-grid-core</include>
<include>org.drools:drools-workitems</include>
<include>org.drools:drools-process-task</include>
<include>org.drools:drools-persistence-jpa</include>
More information about the jboss-svn-commits
mailing list