You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2006/01/26 14:04:44 UTC
svn commit: r372520 - in /incubator/servicemix/trunk: etc/
servicemix-assembly/ servicemix-jsr181/ servicemix-lwcontainer/
servicemix-sca/ servicemix-sca/src/main/java/org/apache/servicemix/sca/
Author: gnodet
Date: Thu Jan 26 05:04:33 2006
New Revision: 372520
URL: http://svn.apache.org/viewcvs?rev=372520&view=rev
Log:
Fix sca build
Remove duplicate dependencies
Upgrade to qdox 1.6-SNAPSHOT to parse java5
Modified:
incubator/servicemix/trunk/etc/project.properties
incubator/servicemix/trunk/servicemix-assembly/project.xml
incubator/servicemix/trunk/servicemix-jsr181/maven.xml
incubator/servicemix/trunk/servicemix-jsr181/project.xml
incubator/servicemix/trunk/servicemix-lwcontainer/project.xml
incubator/servicemix/trunk/servicemix-sca/maven.xml
incubator/servicemix/trunk/servicemix-sca/project.xml
incubator/servicemix/trunk/servicemix-sca/src/main/java/org/apache/servicemix/sca/ScaEndpoint.java
Modified: incubator/servicemix/trunk/etc/project.properties
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/etc/project.properties?rev=372520&r1=372519&r2=372520&view=diff
==============================================================================
--- incubator/servicemix/trunk/etc/project.properties (original)
+++ incubator/servicemix/trunk/etc/project.properties Thu Jan 26 05:04:33 2006
@@ -245,7 +245,7 @@
# (Used in Pluto)
portlet_api_version = 1.0
# http://qdox.codehaus.org/, http://qdox.codehaus.org/license.html, ASL style
-qdox_version=1.5
+qdox_version=1.6-SNAPSHOT
# http://www.opensymphony.com/quartz/, ASL 2
quartz_version=1.5.1
# http://jakarta.apache.org/regexp/, ASL 2
Modified: incubator/servicemix/trunk/servicemix-assembly/project.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-assembly/project.xml?rev=372520&r1=372519&r2=372520&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-assembly/project.xml (original)
+++ incubator/servicemix/trunk/servicemix-assembly/project.xml Thu Jan 26 05:04:33 2006
@@ -565,13 +565,6 @@
</properties>
</dependency>
<dependency>
- <id>commons-dbcp</id>
- <version>${commons_dbcp_version}</version>
- <properties>
- <optional>true</optional>
- </properties>
- </dependency>
- <dependency>
<id>commons-discovery</id>
<version>${commons_discovery_version}</version>
<properties>
@@ -714,14 +707,6 @@
<dependency>
<groupId>servicemix</groupId>
<artifactId>saaj-impl</artifactId>
- <version>${jaxws_rt_version}</version>
- <properties>
- <optional>true</optional>
- </properties>
- </dependency>
- <dependency>
- <groupId>servicemix</groupId>
- <artifactId>jsr181-api</artifactId>
<version>${jaxws_rt_version}</version>
<properties>
<optional>true</optional>
Modified: incubator/servicemix/trunk/servicemix-jsr181/maven.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-jsr181/maven.xml?rev=372520&r1=372519&r2=372520&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-jsr181/maven.xml (original)
+++ incubator/servicemix/trunk/servicemix-jsr181/maven.xml Thu Jan 26 05:04:33 2006
@@ -31,10 +31,6 @@
<attainGoal name="xbean:generate" />
</postGoal>
- <goal name="default">
- <attainGoal name="build"/>
- </goal>
-
<goal name="xbean:generate" description="Generates the XBean XSD, documentation and META-INF/services files.">
<path id="test.classpath">
<pathelement path="${maven.build.dest}" />
Modified: incubator/servicemix/trunk/servicemix-jsr181/project.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-jsr181/project.xml?rev=372520&r1=372519&r2=372520&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-jsr181/project.xml (original)
+++ incubator/servicemix/trunk/servicemix-jsr181/project.xml Thu Jan 26 05:04:33 2006
@@ -257,11 +257,6 @@
</properties>
</dependency>
<dependency>
- <groupId>springframework</groupId>
- <artifactId>spring</artifactId>
- <version>${spring_version}</version>
- </dependency>
- <dependency>
<groupId>incubator-activemq</groupId>
<artifactId>activemq</artifactId>
<version>${activemq_version}</version>
Modified: incubator/servicemix/trunk/servicemix-lwcontainer/project.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-lwcontainer/project.xml?rev=372520&r1=372519&r2=372520&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-lwcontainer/project.xml (original)
+++ incubator/servicemix/trunk/servicemix-lwcontainer/project.xml Thu Jan 26 05:04:33 2006
@@ -164,11 +164,6 @@
<!-- Testing only -->
<dependency>
- <groupId>springframework</groupId>
- <artifactId>spring</artifactId>
- <version>${spring_version}</version>
- </dependency>
- <dependency>
<groupId>incubator-activemq</groupId>
<artifactId>activemq</artifactId>
<version>${activemq_version}</version>
Modified: incubator/servicemix/trunk/servicemix-sca/maven.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-sca/maven.xml?rev=372520&r1=372519&r2=372520&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-sca/maven.xml (original)
+++ incubator/servicemix/trunk/servicemix-sca/maven.xml Thu Jan 26 05:04:33 2006
@@ -26,6 +26,29 @@
<goal name="default" prereqs="jar:install, jbi:install"/>
<goal name="nightly" prereqs="clean, jbi:install, jbi:deploy"/>
+ <postGoal name="java:compile">
+ <attainGoal name="xbean:generate" />
+ </postGoal>
+
+ <goal name="xbean:generate" description="Generates the XBean XSD, documentation and META-INF/services files.">
+ <path id="test.classpath">
+ <pathelement path="${maven.build.dest}" />
+ <pathelement path="${basedir}/target/classes" />
+ <pathelement path="${basedir}/target/test-classes" />
+ <path refid="maven.dependency.classpath" />
+ </path>
+
+ <taskdef name="xsdGenerate" classname="org.xbean.spring.generator.MappingGeneratorTask">
+ <classpath refid="test.classpath" />
+ </taskdef>
+ <xsdGenerate
+ destFile="${basedir}/target/servicemix-sca-${pom.currentVersion}.xsd" namespace="http://servicemix.apache.org/sca/1.0"
+ classpathref="test.classpath" srcdir="${basedir}/src/main/java" metaInfDir="${basedir}/target/generated/"/>
+ <copy file="${basedir}/target/servicemix-sca-${pom.currentVersion}.xsd" todir="${basedir}/target/generated/"/>
+ <copy file="${basedir}/target/servicemix-sca-${pom.currentVersion}.xsd" todir="${basedir}/../xdocs"/>
+ <copy file="${basedir}/target/servicemix-sca-${pom.currentVersion}.xsd.html" todir="${basedir}/../xdocs"/>
+ </goal>
+
<!-- Uploads the installer to the dist repository after deploying the jar binary -->
<postGoal name="jar:deploy">
<artifact:deploy
Modified: incubator/servicemix/trunk/servicemix-sca/project.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-sca/project.xml?rev=372520&r1=372519&r2=372520&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-sca/project.xml (original)
+++ incubator/servicemix/trunk/servicemix-sca/project.xml Thu Jan 26 05:04:33 2006
@@ -58,22 +58,6 @@
</properties>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>servicemix-core</artifactId>
- <version>${pom.currentVersion}</version>
- <properties>
- <eclipse.dependency>true</eclipse.dependency>
- </properties>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>servicemix-jbi</artifactId>
- <version>${pom.currentVersion}</version>
- <properties>
- <eclipse.dependency>true</eclipse.dependency>
- </properties>
- </dependency>
- <dependency>
<groupId>org.eclipse.emf</groupId>
<artifactId>commonj-sdo</artifactId>
<version>${eclipse_emf_version}</version>
@@ -220,6 +204,14 @@
</dependency>
<!-- Provided dependencies -->
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>servicemix-core</artifactId>
+ <version>${pom.currentVersion}</version>
+ <properties>
+ <eclipse.dependency>true</eclipse.dependency>
+ </properties>
+ </dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
@@ -257,14 +249,6 @@
<!-- Testing only -->
<dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>servicemix-core</artifactId>
- <version>${pom.currentVersion}</version>
- <properties>
- <eclipse.dependency>true</eclipse.dependency>
- </properties>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
<artifactId>servicemix-components</artifactId>
<version>${pom.currentVersion}</version>
<properties>
@@ -318,6 +302,14 @@
<groupId>qdox</groupId>
<artifactId>qdox</artifactId>
<version>${qdox_version}</version>
+ <properties>
+ <scope>compile</scope>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>org.xbean</groupId>
+ <artifactId>xbean-spring</artifactId>
+ <version>${xbean_version}</version>
<properties>
<scope>compile</scope>
</properties>
Modified: incubator/servicemix/trunk/servicemix-sca/src/main/java/org/apache/servicemix/sca/ScaEndpoint.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-sca/src/main/java/org/apache/servicemix/sca/ScaEndpoint.java?rev=372520&r1=372519&r2=372520&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-sca/src/main/java/org/apache/servicemix/sca/ScaEndpoint.java (original)
+++ incubator/servicemix/trunk/servicemix-sca/src/main/java/org/apache/servicemix/sca/ScaEndpoint.java Thu Jan 26 05:04:33 2006
@@ -44,6 +44,14 @@
import org.apache.tuscany.model.types.OperationType;
import org.apache.tuscany.model.types.java.JavaOperationType;
+/**
+ *
+ * @author gnodet
+ * @version $Revision: 366467 $
+ * @org.xbean.XBean element="endpoint"
+ * description="A sca endpoint"
+ *
+ */
public class ScaEndpoint extends Endpoint implements ExchangeProcessor {
protected ServiceEndpoint activated;