Author: gnodet
Date: Mon Oct 23 00:04:43 2006
New Revision: 466943
URL: http://svn.apache.org/viewvc?view=rev&rev=466943
Log:
Fix Geronimo deployment for wsdl-first example
Modified:
incubator/servicemix/branches/servicemix-3.0/geronimo/deployer-service/src/main/java/org/apache/servicemix/geronimo/ServiceMixConfigBuilder.java
incubator/servicemix/branches/servicemix-3.0/geronimo/deployer/src/resources/META-INF/geronimo-plugin.xml
incubator/servicemix/branches/servicemix-3.0/geronimo/servicemix/src/plan/geronimo-service.xml
incubator/servicemix/branches/servicemix-3.0/geronimo/servicemix/src/resources/META-INF/geronimo-plugin.xml
Modified:
incubator/servicemix/branches/servicemix-3.0/geronimo/deployer-service/src/main/java/org/apache/servicemix/geronimo/ServiceMixConfigBuilder.java
URL:
http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.0/geronimo/deployer-service/src/main/java/org/apache/servicemix/geronimo/ServiceMixConfigBuilder.java?view=diff&rev=466943&r1=466942&r2=466943
==============================================================================
---
incubator/servicemix/branches/servicemix-3.0/geronimo/deployer-service/src/main/java/org/apache/servicemix/geronimo/ServiceMixConfigBuilder.java
(original)
+++
incubator/servicemix/branches/servicemix-3.0/geronimo/deployer-service/src/main/java/org/apache/servicemix/geronimo/ServiceMixConfigBuilder.java
Mon Oct 23 00:04:43 2006
@@ -146,10 +146,10 @@
Descriptor descriptor = (Descriptor) plan;
if (descriptor.getComponent() != null) {
return new Artifact("servicemix-components",
descriptor.getComponent().getIdentification().getName(),
- (Version) null, "car");
+ "0.0", "car");
} else if (descriptor.getServiceAssembly() != null) {
return new Artifact("servicemix-assemblies",
descriptor.getServiceAssembly().getIdentification().getName(),
- (Version) null, "car");
+ "0.0", "car");
} else if (descriptor.getSharedLibrary() != null) {
return new Artifact("servicemix-libraries",
descriptor.getSharedLibrary().getIdentification().getName(),
descriptor.getSharedLibrary().getVersion(), "car");
@@ -250,17 +250,7 @@
String[] pathElements =
descriptor.getComponent().getComponentClassPath().getPathElements();
if (pathElements != null) {
for (int i = 0; i < pathElements.length; i++) {
- // We can not add includes directly, so move the file and
- // include it
- File include = new File(targetDir, pathElements[i]);
- File temp = new File(workDir, pathElements[i]);
- if (!include.isFile()) {
- throw new Exception("Classpath element '" +
pathElements[i] + "' not found");
- }
- temp.getParentFile().mkdirs();
- include.renameTo(temp);
- context.addInclude(new
URI("install/").resolve(pathElements[i]), temp);
- temp.delete();
+ context.getConfiguration().addToClassPath(new
URI("install/").resolve(pathElements[i]).toString());
}
}
}
Modified:
incubator/servicemix/branches/servicemix-3.0/geronimo/deployer/src/resources/META-INF/geronimo-plugin.xml
URL:
http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.0/geronimo/deployer/src/resources/META-INF/geronimo-plugin.xml?view=diff&rev=466943&r1=466942&r2=466943
==============================================================================
---
incubator/servicemix/branches/servicemix-3.0/geronimo/deployer/src/resources/META-INF/geronimo-plugin.xml
(original)
+++
incubator/servicemix/branches/servicemix-3.0/geronimo/deployer/src/resources/META-INF/geronimo-plugin.xml
Mon Oct 23 00:04:43 2006
@@ -32,8 +32,9 @@
<dependency>geronimo/j2ee-server//car</dependency>
<dependency>geronimo/j2ee-deployer//car</dependency>
<obsoletes>org.apache.servicemix.geronimo/deployer//car</obsoletes>
+ <source-repository>http://servicemix.org/m2-repo/</source-repository>
<source-repository>http://people.apache.org/repo/m2-incubating-repository/</source-repository>
<source-repository>http://people.apache.org/repo/m2-ibiblio-rsync-repository/</source-repository>
<source-repository>http://people.apache.org/~chirino/incubator-activemq-4.0.2-RC5/maven2/</source-repository>
- <source-repository>http://www.ibiblio.org/maven2/</source-repository>
+ <source-repository>http://repo.mergere.com/maven2/</source-repository>
</geronimo-plugin>
Modified:
incubator/servicemix/branches/servicemix-3.0/geronimo/servicemix/src/plan/geronimo-service.xml
URL:
http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.0/geronimo/servicemix/src/plan/geronimo-service.xml?view=diff&rev=466943&r1=466942&r2=466943
==============================================================================
---
incubator/servicemix/branches/servicemix-3.0/geronimo/servicemix/src/plan/geronimo-service.xml
(original)
+++
incubator/servicemix/branches/servicemix-3.0/geronimo/servicemix/src/plan/geronimo-service.xml
Mon Oct 23 00:04:43 2006
@@ -120,6 +120,17 @@
<version>${xbean-version}</version>
<type>jar</type>
</dependency>
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
+ <version>${woodstox-version}</version>
+ <type>jar</type>
+ </dependency>
</dependencies>
</environment>
Modified:
incubator/servicemix/branches/servicemix-3.0/geronimo/servicemix/src/resources/META-INF/geronimo-plugin.xml
URL:
http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.0/geronimo/servicemix/src/resources/META-INF/geronimo-plugin.xml?view=diff&rev=466943&r1=466942&r2=466943
==============================================================================
---
incubator/servicemix/branches/servicemix-3.0/geronimo/servicemix/src/resources/META-INF/geronimo-plugin.xml
(original)
+++
incubator/servicemix/branches/servicemix-3.0/geronimo/servicemix/src/resources/META-INF/geronimo-plugin.xml
Mon Oct 23 00:04:43 2006
@@ -42,8 +42,9 @@
<dependency>org.apache.xbean/xbean-kernel//jar</dependency>
<dependency>org.apache.xbean/xbean-server//jar</dependency>
<obsoletes>org.apache.servicemix.geronimo/servicemix//car</obsoletes>
+ <source-repository>http://servicemix.org/m2-repo/</source-repository>
<source-repository>http://people.apache.org/repo/m2-incubating-repository/</source-repository>
<source-repository>http://people.apache.org/repo/m2-ibiblio-rsync-repository/</source-repository>
<source-repository>http://people.apache.org/~chirino/incubator-activemq-4.0.2-RC5/maven2/</source-repository>
- <source-repository>http://www.ibiblio.org/maven2/</source-repository>
+ <source-repository>http://repo.mergere.com/maven2/</source-repository>
</geronimo-plugin>
