| Commit in servicemix/tooling/jboss-deployer on MAIN | |||
| src/sar/META-INF/jboss-service.xml | +1 | 1.1 -> 1.2 | |
| src/main/java/org/servicemix/jboss/deployment/JBIService.java | +3 | -1 | 1.2 -> 1.3 |
| project.xml | +13 | -3 | 1.2 -> 1.3 |
| project.properties | +15 | -1 | 1.1 -> 1.2 |
| +32 | -5 | ||
Updated to bundle servicemix-1.0
servicemix/tooling/jboss-deployer/src/sar/META-INF
diff -u -r1.1 -r1.2 --- jboss-service.xml 2 Aug 2005 19:09:26 -0000 1.1 +++ jboss-service.xml 29 Sep 2005 18:11:40 -0000 1.2 @@ -12,6 +12,7 @@
<mbean code="org.servicemix.jboss.deployment.JBIService" name="org.servicemix:service=JBIService">
+ <!-- <attribute name="TransactionManager">java:/TransactionManager</attribute> -->
</mbean> </server>
servicemix/tooling/jboss-deployer/src/main/java/org/servicemix/jboss/deployment
diff -u -r1.2 -r1.3 --- JBIService.java 13 Aug 2005 17:10:09 -0000 1.2 +++ JBIService.java 29 Sep 2005 18:11:40 -0000 1.3 @@ -125,7 +125,9 @@
public void installServiceMixXml(String archive) {
// Ok, we are going to use the spring infrastructure
// to create a container
- log.info("Creating ServiceMix JBI installer from XML [" + archive + "]");
+ log
+ .info("Creating ServiceMix JBI installer from XML [" + archive
+ + "]");
FileSystemXmlApplicationContext context = new FileSystemXmlApplicationContext(
archive);
context.getBean("jbi");
servicemix/tooling/jboss-deployer
diff -u -r1.2 -r1.3 --- project.xml 13 Aug 2005 17:10:09 -0000 1.2 +++ project.xml 29 Sep 2005 18:11:40 -0000 1.3 @@ -4,7 +4,8 @@
<pomVersion>3</pomVersion> <name>ServiceMix JBoss Deployer</name> <id>jboss-deployer</id>
- <currentVersion>1.0-SNAPSHOT</currentVersion>
+ <groupId>servicemix</groupId> + <currentVersion>1.0</currentVersion>
<organization> <name>ServiceMix.</name>
@@ -42,7 +43,7 @@
<dependency> <groupId>servicemix</groupId> <artifactId>servicemix</artifactId>
- <version>1.0-M2</version>
+ <version>1.0</version>
<properties> <sar.bundle>true</sar.bundle> </properties>
@@ -94,7 +95,7 @@
<dependency> <groupId>mx4j</groupId> <artifactId>mx4j</artifactId>
- <version>2.1.1</version>
+ <version>2.1.1</version>
</dependency> <dependency> <groupId>mx4j</groupId>
@@ -118,6 +119,15 @@
<groupId>mx4j</groupId> <artifactId>mx4j-impl</artifactId> <version>2.1.1</version>
+ </dependency> + + <dependency> + <id>jencks+all</id> + <version>1.0-M1</version> + <properties> + <lib>true</lib> + <sar.bundle>true</sar.bundle> + </properties>
</dependency> <!--For remote management tasks-->
servicemix/tooling/jboss-deployer
diff -u -r1.1 -r1.2 --- project.properties 2 Aug 2005 19:09:26 -0000 1.1 +++ project.properties 29 Sep 2005 18:11:40 -0000 1.2 @@ -12,4 +12,18 @@
#------------------------------------------------------------------ # A P T S E T T I N G S #------------------------------------------------------------------
-maven.aptdoc.src.dir = ${basedir}/src/site/apt
\ No newline at end of file
+maven.aptdoc.src.dir = ${basedir}/src/site/apt
+
+#------------------------------------------------------------------
+# C O M P I L E R S E T T I N G S
+#------------------------------------------------------------------
+maven.compile.source=1.4
+maven.compile.target=1.4
+maven.test.source=1.4
+maven.compile.deprecation=true
+maven.compile.debug=true
+maven.compile.optimize=true
+
+maven.javadoc.links=http://java.sun.com/j2se/1.4.1/docs/api/,http://java.sun.com/j2ee/1.4/docs/api/
+maven.javadoc.source=1.4
+maven.javadoc.additionalparam = -linksource
\ No newline at end of file
