activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r768041 - in /activemq/activemq-cpp/trunk: ./ activemq-cpp/ activemq-cpp/assembly/ activemq-cpp/src/test-benchmarks/ activemq-cpp/src/test-integration/
Date Thu, 23 Apr 2009 20:30:46 GMT
Author: tabish
Date: Thu Apr 23 20:30:46 2009
New Revision: 768041

URL: http://svn.apache.org/viewvc?rev=768041&view=rev
Log:
Add new maven targets to generate the source package for release and sign it.  Also add the
benchmarks project and the integration tests projects to the set whose makefiles we generate.

Added:
    activemq/activemq-cpp/trunk/activemq-cpp/assembly/
    activemq/activemq-cpp/trunk/activemq-cpp/assembly/source.xml   (with props)
    activemq/activemq-cpp/trunk/activemq-cpp/src/test-benchmarks/Makefile.maven
    activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/Makefile.maven
Modified:
    activemq/activemq-cpp/trunk/activemq-cpp/pom.xml
    activemq/activemq-cpp/trunk/activemq-cpp/src/test-benchmarks/Makefile.am
    activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/Makefile.am
    activemq/activemq-cpp/trunk/pom.xml

Added: activemq/activemq-cpp/trunk/activemq-cpp/assembly/source.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/assembly/source.xml?rev=768041&view=auto
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/assembly/source.xml (added)
+++ activemq/activemq-cpp/trunk/activemq-cpp/assembly/source.xml Thu Apr 23 20:30:46 2009
@@ -0,0 +1,45 @@
+<assembly>
+  <id>source</id>
+  <formats>
+    <format>tar.gz</format>
+    <format>tar.bz2</format>
+    <format>zip</format>
+  </formats>
+  <files>
+    <file>
+      <source>autogen.sh</source>
+      <outputDirectory>/</outputDirectory>
+      <filtered>false</filtered>
+      <fileMode>0755</fileMode>
+    </file>
+  </files>
+  <fileSets>
+    <fileSet>
+      <includes>
+        <include>KEYS</include>
+        <include>doxygen.cfg</include>
+        <include>activemq-cpp.pc.in</include>
+        <include>activemqcpp-config.in</include>
+        <include>*.txt</include>
+        <include>*.win</include>
+        <include>*.ac</include>
+        <include>*.am</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>src</directory>
+    </fileSet>
+    <fileSet>
+      <directory>doc</directory>
+    </fileSet>
+    <fileSet>
+      <directory>m4</directory>
+    </fileSet>
+    <fileSet>
+      <directory>activemq-cpp.xcodeproj</directory>
+    </fileSet>
+    <fileSet>
+      <directory>vs2005-build</directory>
+    </fileSet>
+  </fileSets>
+</assembly>

Propchange: activemq/activemq-cpp/trunk/activemq-cpp/assembly/source.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: activemq/activemq-cpp/trunk/activemq-cpp/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/pom.xml?rev=768041&r1=768040&r2=768041&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/pom.xml (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/pom.xml Thu Apr 23 20:30:46 2009
@@ -70,6 +70,58 @@
         <inherited>false</inherited>
         <executions>
           <execution>
+            <id>Benchmarks-Makefile</id>
+            <configuration>
+              <outputDirectory>${basedir}/src/test-benchmarks/</outputDirectory>
+              <template>${basedir}/src/test-benchmarks/Makefile.maven</template>
+              <sources>
+                <directory>${basedir}/src/test-benchmarks/</directory>
+                <includes>
+                  <includes>**\*.cpp</includes>
+                </includes>
+              </sources>
+              <headers>
+                <directory>${basedir}/src/test-benchmarks/</directory>
+                <includes>
+                  <includes>**\*.h</includes>
+                </includes>
+              </headers>
+            </configuration>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>makefile</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>Integration-Test-Makefile</id>
+            <configuration>
+              <outputDirectory>${basedir}/src/test-integration/</outputDirectory>
+              <template>${basedir}/src/test-integration/Makefile.maven</template>
+              <sources>
+                <directory>${basedir}/src/test-integration/</directory>
+                <includes>
+                  <includes>**\*.cpp</includes>
+                </includes>
+                <excludes>
+                  <exclude>**/activemq/test/stomp/**\*.cpp</exclude>
+                </excludes>
+              </sources>
+              <headers>
+                <directory>${basedir}/src/test-integration/</directory>
+                <includes>
+                  <includes>**\*.h</includes>
+                </includes>
+                <excludes>
+                  <exclude>**/activemq/test/stomp/**\*.h</exclude>
+                </excludes>
+              </headers>
+            </configuration>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>makefile</goal>
+            </goals>
+          </execution>
+          <execution>
             <id>Test-Makefile</id>
             <configuration>
               <outputDirectory>${basedir}/src/test/</outputDirectory>
@@ -135,6 +187,35 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <configuration>
+          <descriptors>
+            <descriptor>assembly/source.xml</descriptor>
+          </descriptors>
+          <tarLongFileMode>gnu</tarLongFileMode>
+        </configuration>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-gpg-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>verify</phase>
+            <goals>
+              <goal>sign</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 </project>

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test-benchmarks/Makefile.am
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test-benchmarks/Makefile.am?rev=768041&r1=768040&r2=768041&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test-benchmarks/Makefile.am (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test-benchmarks/Makefile.am Thu Apr 23 20:30:46
2009
@@ -16,31 +16,33 @@
 # ---------------------------------------------------------------------------
 
 cc_sources = \
-  activemq/wireformat/openwire/utils/OpenWireStringSupportBenchmark.cpp \
-  activemq/util/PrimitiveMapBenchmark.cpp \
-  decaf/lang/BooleanBenchmark.cpp \
-  decaf/util/PropertiesBenchmark.cpp \
-  decaf/util/QueueBenchmark.cpp \
-  decaf/util/SetBenchmark.cpp \
-  decaf/util/MapBenchmark.cpp \
-  decaf/io/DataInputStreamBenchmark.cpp \
-  decaf/io/DataOutputStreamBenchmark.cpp \
-  benchmark/PerformanceTimer.cpp \
-  testRegistry.cpp \
-  main.cpp
-
-hh_sources = \
-  activemq/wireformat/openwire/utils/OpenWireStringSupportBenchmark.h \
-  activemq/util/PrimitiveMapBenchmark.h \
-  decaf/lang/BooleanBenchmark.h \
-  decaf/util/PropertiesBenchmark.h \
-  decaf/util/QueueBenchmark.h \
-  decaf/util/SetBenchmark.h \
-  decaf/util/MapBenchmark.h \
-  decaf/io/DataInputStreamBenchmark.h \
-  decaf/io/DataOutputStreamBenchmark.h \
-  benchmark/BenchmarkBase.h \
-  benchmark/PerformanceTimer.h
+    decaf/lang/BooleanBenchmark.cpp \
+    decaf/util/QueueBenchmark.cpp \
+    decaf/util/SetBenchmark.cpp \
+    decaf/util/MapBenchmark.cpp \
+    decaf/util/PropertiesBenchmark.cpp \
+    decaf/io/DataOutputStreamBenchmark.cpp \
+    decaf/io/DataInputStreamBenchmark.cpp \
+    main.cpp \
+    testRegistry.cpp \
+    benchmark/PerformanceTimer.cpp \
+    activemq/wireformat/openwire/utils/OpenWireStringSupportBenchmark.cpp \
+    activemq/util/PrimitiveMapBenchmark.cpp
+
+
+h_sources = \
+    decaf/lang/BooleanBenchmark.h \
+    decaf/util/QueueBenchmark.h \
+    decaf/util/MapBenchmark.h \
+    decaf/util/SetBenchmark.h \
+    decaf/util/PropertiesBenchmark.h \
+    decaf/io/DataInputStreamBenchmark.h \
+    decaf/io/DataOutputStreamBenchmark.h \
+    benchmark/PerformanceTimer.h \
+    benchmark/BenchmarkBase.h \
+    activemq/wireformat/openwire/utils/OpenWireStringSupportBenchmark.h \
+    activemq/util/PrimitiveMapBenchmark.h
+
 
 ## Compile this as part of make check
 check_PROGRAMS = activemq-test-benchmarks

Added: activemq/activemq-cpp/trunk/activemq-cpp/src/test-benchmarks/Makefile.maven
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test-benchmarks/Makefile.maven?rev=768041&view=auto
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test-benchmarks/Makefile.maven (added)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test-benchmarks/Makefile.maven Thu Apr 23
20:30:46 2009
@@ -0,0 +1,33 @@
+# ---------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+# 
+# http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ---------------------------------------------------------------------------
+
+cc_sources = \
+    ${source}
+
+h_sources = \
+    ${headers}
+
+## Compile this as part of make check
+check_PROGRAMS = activemq-test-benchmarks
+
+## 
+## Compiler/Linker Options
+##
+activemq_test_benchmarks_SOURCES = $(cc_sources)
+activemq_test_benchmarks_CXXFLAGS = $(AMQ_TEST_CXXFLAGS) $(DECAF_TEST_CXXFLAGS) -I$(srcdir)/../main
@CPPUNIT_CFLAGS@
+activemq_test_benchmarks_LDADD= $(AMQ_TEST_LIBS) $(DECAF_TEST_LIBS) @CPPUNIT_LIBS@
+

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/Makefile.am
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/Makefile.am?rev=768041&r1=768040&r2=768041&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/Makefile.am (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/Makefile.am Thu Apr 23 20:30:46
2009
@@ -16,42 +16,60 @@
 # ---------------------------------------------------------------------------
 
 cc_sources = \
-  activemq/util/CMSListener.cpp \
-  activemq/util/CMSProvider.cpp \
-  activemq/util/IntegrationCommon.cpp \
-  activemq/test/AsyncSenderTest.cpp \
-  activemq/test/CmsTemplateTest.cpp \
-  activemq/test/DurableTest.cpp \
-  activemq/test/ExpirationTest.cpp \
-  activemq/test/SimpleRollbackTest.cpp \
-  activemq/test/SimpleTest.cpp \
-  activemq/test/TransactionTest.cpp \
-  activemq/test/SlowListenerTest.cpp \
-  activemq/test/JmsMessageGroupsTest.cpp \
-  activemq/test/openwire/OpenwireAsyncSenderTest.cpp \
-  activemq/test/openwire/OpenwireCmsTemplateTest.cpp \
-  activemq/test/openwire/OpenwireDurableTest.cpp \
-  activemq/test/openwire/OpenwireExpirationTest.cpp \
-  activemq/test/openwire/OpenwireSimpleRollbackTest.cpp \
-  activemq/test/openwire/OpenwireSimpleTest.cpp \
-  activemq/test/openwire/OpenwireTransactionTest.cpp \
-  activemq/test/openwire/OpenwireTempDestinationTest.cpp \
-  activemq/test/openwire/OpenwireSlowListenerTest.cpp \
-  activemq/test/openwire/OpenwireJmsMessageGroupsTest.cpp \
-  TestRegistry.cpp \
-  util/teamcity/TeamCityProgressListener.cpp \
-  main.cpp
-
-#  activemq/test/stomp/StompAsyncSenderTest.cpp \
-  activemq/test/stomp/StompCmsTemplateTest.cpp \
-  activemq/test/stomp/StompDurableTest.cpp \
-  activemq/test/stomp/StompExpirationTest.cpp \
-  activemq/test/stomp/StompSimpleRollbackTest.cpp \
-  activemq/test/stomp/StompSimpleTest.cpp \
-  activemq/test/stomp/StompTransactionTest.cpp \
-  activemq/test/stomp/StompSlowListenerTest.cpp \
-  activemq/test/stomp/StompJmsMessageGroupsTest.cpp
-  
+    main.cpp \
+    util/teamcity/TeamCityProgressListener.cpp \
+    TestRegistry.cpp \
+    activemq/test/DurableTest.cpp \
+    activemq/test/openwire/OpenwireCmsTemplateTest.cpp \
+    activemq/test/openwire/OpenwireTempDestinationTest.cpp \
+    activemq/test/openwire/OpenwireTransactionTest.cpp \
+    activemq/test/openwire/OpenwireSimpleTest.cpp \
+    activemq/test/openwire/OpenwireExpirationTest.cpp \
+    activemq/test/openwire/OpenwireSlowListenerTest.cpp \
+    activemq/test/openwire/OpenwireJmsMessageGroupsTest.cpp \
+    activemq/test/openwire/OpenwireAsyncSenderTest.cpp \
+    activemq/test/openwire/OpenwireSimpleRollbackTest.cpp \
+    activemq/test/openwire/OpenwireDurableTest.cpp \
+    activemq/test/SimpleTest.cpp \
+    activemq/test/AsyncSenderTest.cpp \
+    activemq/test/TransactionTest.cpp \
+    activemq/test/ExpirationTest.cpp \
+    activemq/test/SimpleRollbackTest.cpp \
+    activemq/test/JmsMessageGroupsTest.cpp \
+    activemq/test/CmsTemplateTest.cpp \
+    activemq/test/SlowListenerTest.cpp \
+    activemq/util/CMSProvider.cpp \
+    activemq/util/IntegrationCommon.cpp \
+    activemq/util/CMSListener.cpp
+
+
+h_sources = \
+    util/teamcity/TeamCityProgressListener.h \
+    activemq/test/openwire/OpenwireAsyncSenderTest.h \
+    activemq/test/openwire/OpenwireTransactionTest.h \
+    activemq/test/openwire/OpenwireJmsMessageGroupsTest.h \
+    activemq/test/openwire/OpenwireCmsTemplateTest.h \
+    activemq/test/openwire/OpenwireSimpleRollbackTest.h \
+    activemq/test/openwire/OpenwireDurableTest.h \
+    activemq/test/openwire/OpenwireSimpleTest.h \
+    activemq/test/openwire/OpenwireTempDestinationTest.h \
+    activemq/test/openwire/OpenwireSlowListenerTest.h \
+    activemq/test/openwire/OpenwireExpirationTest.h \
+    activemq/test/JmsMessageGroupsTest.h \
+    activemq/test/AsyncSenderTest.h \
+    activemq/test/CMSTestFixture.h \
+    activemq/test/DurableTest.h \
+    activemq/test/TransactionTest.h \
+    activemq/test/ExpirationTest.h \
+    activemq/test/CmsTemplateTest.h \
+    activemq/test/SlowListenerTest.h \
+    activemq/test/SimpleRollbackTest.h \
+    activemq/test/SimpleTest.h \
+    activemq/util/CMSProvider.h \
+    activemq/util/IntegrationCommon.h \
+    activemq/util/CMSListener.h
+
+
 ## Compile this as part of make check
 check_PROGRAMS = activemq-test-integration
 

Added: activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/Makefile.maven
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/Makefile.maven?rev=768041&view=auto
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/Makefile.maven (added)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/Makefile.maven Thu Apr 23
20:30:46 2009
@@ -0,0 +1,33 @@
+# ---------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+# 
+# http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ---------------------------------------------------------------------------
+
+cc_sources = \
+    ${source}
+
+h_sources = \
+    ${headers}
+
+## Compile this as part of make check
+check_PROGRAMS = activemq-test-integration
+
+## 
+## Compiler/Linker Options
+##
+activemq_test_integration_SOURCES = $(cc_sources)
+activemq_test_integration_CXXFLAGS = $(AMQ_TEST_CXXFLAGS) -I$(srcdir)/../main @CPPUNIT_CFLAGS@
+activemq_test_integration_LDADD= $(AMQ_TEST_LIBS) @CPPUNIT_LIBS@
+

Modified: activemq/activemq-cpp/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/pom.xml?rev=768041&r1=768040&r2=768041&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/pom.xml (original)
+++ activemq/activemq-cpp/trunk/pom.xml Thu Apr 23 20:30:46 2009
@@ -67,7 +67,7 @@
     <ant-version>1.6.2</ant-version>
     <xstream-version>1.3.1</xstream-version>
     <activemq-core-dir>${ACTIVEMQ_SRC_HOME}/activemq-core/</activemq-core-dir>
-    <activemq-cpp-openwire-generator>2.0</activemq-cpp-openwire-generator>
+    <activemq-cpp-openwire-generator-version>2.0</activemq-cpp-openwire-generator-version>
   </properties>
 
   <modules>
@@ -82,4 +82,43 @@
     <url>http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/</url>
   </scm>
 
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.apache.activemq</groupId>
+        <artifactId>activemq-cpp-openwire-generator</artifactId>
+        <version>${activemq-cpp-openwire-generator-version}</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-antrun-plugin</artifactId>
+          <version>1.1</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-assembly-plugin</artifactId>
+          <version>2.2-beta-2</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-gpg-plugin</artifactId>
+          <version>1.0-alpha-4</version>
+          <executions>
+            <execution>
+              <goals>
+                <goal>sign</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
+
 </project>



Mime
View raw message