Merge pull request #169 from tishan89/master

packing activemq
wso2-attic · Jun 7, 2017 · 25fd5ca · 25fd5ca
2 parents 18b88ac + 7fe6db9
commit 25fd5ca
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,7 +5,6 @@ target/
 .mtj.tmp/
 
 # Package Files #
-*.jar
 *.war
 *.ear
 

diff --git a/modules/distribution/carbon-home/external-libs/activemq_broker_5.9.0_1.0.0.jar b/modules/distribution/carbon-home/external-libs/activemq_broker_5.9.0_1.0.0.jar
diff --git a/modules/distribution/carbon-home/external-libs/activemq_client_5.9.0_1.0.0.jar b/modules/distribution/carbon-home/external-libs/activemq_client_5.9.0_1.0.0.jar
diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
@@ -228,6 +228,12 @@
                                     <version>${siddhi.extension.version}</version>
                                     <type>jar</type>
                                 </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.apache.geronimo.specs</groupId>
+                                    <artifactId>geronimo-jms_1.1_spec</artifactId>
+                                    <version>1.1.1</version>
+                                    <type>jar</type>
+                                </artifactItem>
                             </artifactItems>
                             <outputDirectory>${project.build.directory}/extensions</outputDirectory>
                             <overWriteReleases>false</overWriteReleases>

diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
@@ -146,6 +146,14 @@
             </includes>
             <fileMode>664</fileMode>
         </fileSet>
+        <fileSet>
+            <directory>carbon-home/external-libs</directory>
+            <outputDirectory>lib</outputDirectory>
+            <includes>
+                <include>**/*.jar</include>
+            </includes>
+            <fileMode>664</fileMode>
+        </fileSet>
     </fileSets>
 
     <files>

diff --git a/modules/samples/artifacts/0012/READMe.txt b/modules/samples/artifacts/0012/READMe.txt
@@ -1,11 +1,7 @@
 1. Copy {WSO2DASHome}/samples/0012/jms-sample.siddhi file to {WSO2DASHome}/deployment/siddhi-files
-2. Covert following libs in {ActiveMQHome}/lib to OSGi using bin/jartobundle.sh and add to {WSO2DASHome}/lib
-    * activemq-broker-5.9.0.jar
-    * activemq-client-5.9.0.jar
-3. Copy following libs in {ActiveMQHome}/lib to {WSO2DASHome}/lib
+2. Copy following libs in {ActiveMQHome}/lib to {WSO2DASHome}/lib
     * hawtbuf-1.9.jar
     * geronimo-j2ee-management_1.1_spec-1.0.1.jar
-    * geronimo-jms_1.1_spec-1.1.1.jar
 4. Navigate to {ActiveMQHome}/bin and start ActiveMQ using ./activemq start
 5. Navigate to {WSO2DASHome}/bin and start using ./worker.sh
 6. Publish below text message to DAS_JMS_TEST topic using ActiveMQ web console.