Author: foconer
Date: Fri May 19 20:07:16 2006
New Revision: 407946
URL: http://svn.apache.org/viewvc?rev=407946&view=rev
Log:
Bug: Error when build in maven 1.
Fix:
1. Added maven 1 buildscript in servicemix-services.
2. Added missing dependency xbean-server in servicemix-core.
3. Added servicemix-services in multiproject includes.
Added:
incubator/servicemix/trunk/servicemix-services/maven.xml
incubator/servicemix/trunk/servicemix-services/project.xml
Modified:
incubator/servicemix/trunk/project.properties
incubator/servicemix/trunk/servicemix-core/project.xml
Modified: incubator/servicemix/trunk/project.properties
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/project.properties?rev=407946&r1=407945&r2=407946&view=diff
==============================================================================
--- incubator/servicemix/trunk/project.properties (original)
+++ incubator/servicemix/trunk/project.properties Fri May 19 20:07:16 2006
@@ -79,6 +79,7 @@
maven.multiproject.includes=\
servicemix-jbi/project.xml,\
+ servicemix-services/project.xml,\
servicemix-core/project.xml,\
servicemix-components/project.xml,\
servicemix-console/project.xml,\
Modified: incubator/servicemix/trunk/servicemix-core/project.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-core/project.xml?rev=407946&r1=407945&r2=407946&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/project.xml (original)
+++ incubator/servicemix/trunk/servicemix-core/project.xml Fri May 19 20:07:16 2006
@@ -34,6 +34,14 @@
<eclipse.dependency>true</eclipse.dependency>
</properties>
</dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>servicemix-services</artifactId>
+ <version>${pom.currentVersion}</version>
+ <properties>
+ <eclipse.dependency>true</eclipse.dependency>
+ </properties>
+ </dependency>
<dependency>
<groupId>mx4j</groupId>
@@ -203,6 +211,12 @@
<url>http://www.xbean.org</url>
</dependency>
<dependency>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-server</artifactId>
+ <version>${xbean_version}</version>
+ <url>http://www.xbean.org</url>
+ </dependency>
+ <dependency>
<groupId>annogen</groupId>
<artifactId>annogen</artifactId>
<version>${annogen_version}</version>
@@ -437,4 +451,4 @@
</resources>
</build>
-</project>
+</project>
\ No newline at end of file
Added: incubator/servicemix/trunk/servicemix-services/maven.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-services/maven.xml?rev=407946&view=auto
==============================================================================
--- incubator/servicemix/trunk/servicemix-services/maven.xml (added)
+++ incubator/servicemix/trunk/servicemix-services/maven.xml Fri May 19 20:07:16 2006
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!--
+
+ 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.
+
+-->
+
+<project default="default" xmlns:ant="jelly:ant">
+
+ <!-- default goal is defined in /etc/ -->
+
+</project>
\ No newline at end of file
Added: incubator/servicemix/trunk/servicemix-services/project.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-services/project.xml?rev=407946&view=auto
==============================================================================
--- incubator/servicemix/trunk/servicemix-services/project.xml (added)
+++ incubator/servicemix/trunk/servicemix-services/project.xml Fri May 19 20:07:16 2006
@@ -0,0 +1,66 @@
+<?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.
+
+-->
+
+<project>
+ <pomVersion>3</pomVersion>
+ <extend>${basedir}/../etc/project.xml</extend>
+
+ <name>ServiceMix :: Services</name>
+ <id>servicemix-services</id>
+
+ <dependencies>
+ <dependency>
+ <groupId>incubator-activemq</groupId>
+ <artifactId>activeio-core</artifactId>
+ <version>${activeio_version}</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>backport-util-concurrent</groupId>
+ <artifactId>backport-util-concurrent</artifactId>
+ <version>${backport_util_concurrent_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>${commons_logging_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <version>${hsqldb_version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <includes>
+ <include>**/*.properties</include>
+ <include>**/*.xml</include>
+ <include>**/*</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
+
+ </project>
\ No newline at end of file
|