servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r359556 - in /incubator/servicemix/trunk/assembly: maven.xml pom.xml project.properties project.xml src/descriptors/ src/descriptors/bin.xml src/release/conf/activemq.xml src/release/conf/servicemix.conf src/release/conf/servicemix.xml
Date Wed, 28 Dec 2005 16:13:44 GMT
Author: gnodet
Date: Wed Dec 28 08:13:38 2005
New Revision: 359556

URL: http://svn.apache.org/viewcvs?rev=359556&view=rev
Log:
Update assembly to m2

Added:
    incubator/servicemix/trunk/assembly/pom.xml
    incubator/servicemix/trunk/assembly/src/descriptors/
    incubator/servicemix/trunk/assembly/src/descriptors/bin.xml
Removed:
    incubator/servicemix/trunk/assembly/maven.xml
    incubator/servicemix/trunk/assembly/project.properties
    incubator/servicemix/trunk/assembly/project.xml
Modified:
    incubator/servicemix/trunk/assembly/src/release/conf/activemq.xml
    incubator/servicemix/trunk/assembly/src/release/conf/servicemix.conf
    incubator/servicemix/trunk/assembly/src/release/conf/servicemix.xml

Added: incubator/servicemix/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/assembly/pom.xml?rev=359556&view=auto
==============================================================================
--- incubator/servicemix/trunk/assembly/pom.xml (added)
+++ incubator/servicemix/trunk/assembly/pom.xml Wed Dec 28 08:13:38 2005
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright 2005 The Apache Software Foundation
+
+    Licensed 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.
+-->
+<!-- $Rev: 359503 $ $Date: 2005-12-28 13:56:03 +0100 (mer., 28 déc. 2005) $ -->
+<model>
+    <modelVersion>4.0.0</modelVersion>
+    
+    <parent>
+        <groupId>org.apache.servicemix</groupId>
+        <artifactId>servicemix</artifactId>
+        <version>3.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    
+    <artifactId>servicemix-assembly</artifactId>
+    <packaging>jar</packaging>
+    <name>Servicemix :: Assembly</name>
+    
+    <dependencies>
+       <dependency>
+         <groupId>org.apache.servicemix</groupId>
+         <artifactId>servicemix-jbi</artifactId>
+       </dependency>
+       <dependency>
+         <groupId>org.apache.servicemix</groupId>
+         <artifactId>servicemix-core</artifactId>
+       </dependency>
+       <dependency>
+         <groupId>org.apache.servicemix</groupId>
+         <artifactId>servicemix-components</artifactId>
+       </dependency>
+       <dependency>
+         <groupId>classworlds</groupId>
+         <artifactId>classworlds</artifactId>
+       </dependency>
+       
+       <dependency>
+         <groupId>xmlbeans</groupId>
+         <artifactId>xbean</artifactId>
+         <scope>optional</scope>
+       </dependency>
+    
+    </dependencies>
+
+    <build>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-assembly-plugin</artifactId>
+          <executions>
+            <execution>
+              <phase>install</phase>
+              <goals>
+                <goal>assembly</goal>
+              </goals>
+              <configuration>
+                <descriptor>src/descriptors/bin.xml</descriptor>
+              </configuration>
+            </execution>
+          </executions>
+        </plugin>
+      </plugins>
+    </build>
+    
+</model>

Added: incubator/servicemix/trunk/assembly/src/descriptors/bin.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/assembly/src/descriptors/bin.xml?rev=359556&view=auto
==============================================================================
--- incubator/servicemix/trunk/assembly/src/descriptors/bin.xml (added)
+++ incubator/servicemix/trunk/assembly/src/descriptors/bin.xml Wed Dec 28 08:13:38 2005
@@ -0,0 +1,30 @@
+<assembly>
+      <id>bin</id>
+      <formats>
+        <format>tar.gz</format>
+        <format>zip</format>
+      </formats>
+      <fileSets>
+        <fileSet>
+          <includes>
+            <include>README*</include>
+            <include>LICENSE*</include>
+            <include>NOTICE*</include>
+          </includes>
+        </fileSet>
+        <fileSet>
+          <directory>src/release</directory>
+          <outputDirectory></outputDirectory>
+        </fileSet>
+      </fileSets>
+      <dependencySets>
+        <dependencySet>
+          <outputDirectory>lib</outputDirectory>
+          <scope>runtime</scope>
+        </dependencySet>
+        <dependencySet>
+          <outputDirectory>lib/optional</outputDirectory>
+          <scope>optional</scope>
+        </dependencySet>
+      </dependencySets>
+    </assembly>

Modified: incubator/servicemix/trunk/assembly/src/release/conf/activemq.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/assembly/src/release/conf/activemq.xml?rev=359556&r1=359555&r2=359556&view=diff
==============================================================================
--- incubator/servicemix/trunk/assembly/src/release/conf/activemq.xml (original)
+++ incubator/servicemix/trunk/assembly/src/release/conf/activemq.xml Wed Dec 28 08:13:38
2005
@@ -1,69 +1,64 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC  "-//ACTIVEMQ//DTD//EN" "http://activemq.org/dtd/activemq.dtd">
-<beans>
+<!-- START SNIPPET: xbean -->
+<beans xmlns="http://activemq.org/config/1.0">
   
-  <!-- ==================================================================== -->
-  <!-- ActiveMQ Broker Configuration -->
-  <!-- ==================================================================== -->
-  <broker>
-    <connector>
-      <tcpServerTransport uri="tcp://localhost:61616" backlog="1000" useAsyncSend="true"
maxOutstandingMessages="50"/>
-    </connector>
+  <broker useJmx="true">
 
-    <persistence>
-      <cachePersistence>
-        <journalPersistence directory="../var/journal">
-          <jdbcPersistence dataSourceRef="derby-ds"/>
-        </journalPersistence>
-      </cachePersistence>
-    </persistence>
+    <persistenceAdapter>
+      <journaledJDBC journalLogFiles="5" dataDirectory="../data"/>
+      <!-- To use a different datasource, use th following syntax : -->
+      <!-- 
+      <journaledJDBC journalLogFiles="5" dataDirectory="../data" dataSource="#postgres-ds"/>
+       -->
+    </persistenceAdapter>
+  
+    <transportConnectors>
+       <transportConnector uri="tcp://localhost:61616" discoveryUri="multicast://default"/>
+    </transportConnectors>
+    
+    <networkConnectors>
+      <!-- by default just auto discover the other brokers -->
+      <networkConnector uri="multicast://default"/>
+      <!--  
+      <networkConnector uri="static://(tcp://host1:61616,tcp://host2:61616)"/>
+      -->
+    </networkConnectors>
+    
   </broker>
-
-  <!-- ==================================================================== -->
-  <!-- JDBC DataSource Configurations -->
-  <!-- ==================================================================== -->
-
-  <!-- The Derby Datasource that will be used by the Broker -->
-  <bean id="derby-ds" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
-    <property name="driverClassName">
-      <value>org.apache.derby.jdbc.EmbeddedDriver</value>
-    </property>
-    <property name="url">
-      <!-- Use a URL like 'jdbc:hsqldb:hsql://localhost:9001' if you want to connect to
a remote hsqldb -->
-      <value>jdbc:derby:derbydb;create=true</value>
-    </property>
-    <property name="username">
-      <value></value>
-    </property>
-    <property name="password">
-      <value></value>
-    </property>
-    <property name="poolPreparedStatements">
-      <value>true</value>
-    </property>
+  
+  <!--  This xbean configuration file supports all the standard spring xml configuration
options -->
+  
+  <!-- Postgres DataSource Sample Setup -->
+  <!-- 
+  <bean id="postgres-ds" class="org.postgresql.ds.PGPoolingDataSource">
+    <property name="serverName" value="localhost"/>
+    <property name="databaseName" value="activemq"/>
+    <property name="portNumber" value="0"/>
+    <property name="user" value="activemq"/>
+    <property name="password" value="activemq"/>
+    <property name="dataSourceName" value="postgres"/>
+    <property name="initialConnections" value="1"/>
+    <property name="maxConnections" value="10"/>
   </bean>
-
-  <!-- The MYSQL Datasource that will be used by the Broker -->
-  <bean id="mysql-ds"
-    class="org.apache.commons.dbcp.BasicDataSource"
-    destroy-method="close">
-    <property name="driverClassName">
-      <value>com.mysql.jdbc.Driver</value>
-    </property>
-    <property name="url">
-      <value>jdbc:mysql://localhost/activemq</value>
-    </property>
-    <property name="username">
-      <value>myname</value>
-    </property>
-    <property name="password">
-      <value>mypassword</value>
-    </property>
-    <property name="poolPreparedStatements">
-      <value>true</value>
-    </property>
+  -->
+  
+  <!-- MySql DataSource Sample Setup -->
+  <!-- 
+  <bean id="mysql-ds" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
+    <property name="driverClassName" value="com.mysql.jdbc.Driver"/>
+    <property name="url" value="jdbc:mysql://localhost/activemq"/>
+    <property name="username" value="activemq"/>
+    <property name="password" value="activemq"/>
+    <property name="poolPreparedStatements" value="true"/>
   </bean>
-
+  -->  
+   
+  <!-- Embedded Derby DataSource Sample Setup -->
+  <!-- 
+  <bean id="derby-ds" class="org.apache.derby.jdbc.EmbeddedDataSource">
+    <property name="databaseName" value="derbydb"/>
+    <property name="createDatabase" value="create"/>
+  </bean>
+  -->  
 
 </beans>
-
+<!-- END SNIPPET: xbean -->

Modified: incubator/servicemix/trunk/assembly/src/release/conf/servicemix.conf
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/assembly/src/release/conf/servicemix.conf?rev=359556&r1=359555&r2=359556&view=diff
==============================================================================
--- incubator/servicemix/trunk/assembly/src/release/conf/servicemix.conf (original)
+++ incubator/servicemix/trunk/assembly/src/release/conf/servicemix.conf Wed Dec 28 08:13:38
2005
@@ -2,7 +2,7 @@
 # $Id$
 #
 
-main is org.servicemix.Main from app
+main is org.apache.servicemix.Main from app
 
 [app]
     load ${servicemix.home}/conf

Modified: incubator/servicemix/trunk/assembly/src/release/conf/servicemix.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/assembly/src/release/conf/servicemix.xml?rev=359556&r1=359555&r2=359556&view=diff
==============================================================================
--- incubator/servicemix/trunk/assembly/src/release/conf/servicemix.xml (original)
+++ incubator/servicemix/trunk/assembly/src/release/conf/servicemix.xml Wed Dec 28 08:13:38
2005
@@ -1,36 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://xbean.org/schemas/spring/1.0"
-	xmlns:spring="http://xbean.org/schemas/spring/1.0"
-	xmlns:sm="http://servicemix.org/config/1.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://xbean.org/schemas/spring/1.0 spring-beans.xsd
-	                    http://servicemix.org/config/1.0 servicemix.xsd">
-
+<beans xmlns:sm="http://servicemix.apache.org/config/1.0">
 
   <!-- the JBI container -->
-	<!-- the JBI container -->
-	<sm:container spring:id="jbi" 
-          rootDir="../wdir" 
-          useMBeanServer="true"
-		  createMBeanServer="true" 
-          installationDirPath="../install"
-          deploymentDirPath="../deploy"
-		  monitorInstallationDirectory="true" 
-          dumpStats="true"
-		  statsInterval="10" 
-		  flowName="seda"
-          transactionManager="#transactionManager">
+  <sm:container id="jbi" 
+                rootDir="../wdir" 
+                useMBeanServer="true"
+                createMBeanServer="true" 
+                installationDirPath="../install"
+                deploymentDirPath="../deploy"
+		            monitorInstallationDirectory="true" 
+                dumpStats="true"
+		            statsInterval="10" 
+		            flowName="seda"
+                transactionManager="#transactionManager">
 
-		<sm:activationSpecs>
+    <sm:activationSpecs>
 		
-		</sm:activationSpecs>
-	</sm:container>
+    </sm:activationSpecs>
+  </sm:container>
 
   <bean id="transactionContextManager" class="org.jencks.factory.TransactionContextManagerFactoryBean"/>
   <bean id="transactionManager" class="org.jencks.factory.GeronimoTransactionManagerFactoryBean"
/>
 
   <!-- message broker -->
-  <bean id="broker" class="org.activemq.spring.BrokerFactoryBean">
+  <bean id="broker" class="org.activemq.xbean.BrokerFactoryBean">
      <property name="config" value="classpath:activemq.xml"/>
   </bean>
 



Mime
View raw message