SAVARA-386 Update to version 2.3.0-SNAPSHOT and switchyard version 1.…

…1.0.Final
objectiser · Nov 24, 2013 · 9f7a4e4 · 9f7a4e4
1 parent 4d3a847
commit 9f7a4e4
Show file tree

Hide file tree

Showing 29 changed files with 505 additions and 471 deletions.
diff --git a/features/org.savara.tools.feature/feature.xml b/features/org.savara.tools.feature/feature.xml
@@ -39,13 +39,6 @@ source code, or contact Red Hat Legal Affairs, 1801 Varsity Drive,
 Raleigh NC 27606 USA.
    </license>
 
-   <plugin
-         id="org.savara.tools.dependencies"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.savara.tools.common"
          download-size="0"

diff --git a/features/org.savara.tools.feature/pom.xml b/features/org.savara.tools.feature/pom.xml
@@ -18,11 +18,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
 	</properties>
 
    	<dependencies>
- 		<dependency>
- 			<groupId>org.savara.tools</groupId>
-			<artifactId>org.savara.tools.dependencies</artifactId> 
-			<version>${project.version}</version>
- 		</dependency>
  		<dependency>
  			<groupId>org.savara.tools</groupId>
 			<artifactId>org.savara.tools.common</artifactId> 

diff --git a/plugins/org.savara.tools.bpel/META-INF/MANIFEST.MF b/plugins/org.savara.tools.bpel/META-INF/MANIFEST.MF
@@ -15,10 +15,10 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.jst.common.frameworks,
  org.eclipse.wst.common.frameworks,
  org.eclipse.wst.common.project.facet.core,
- org.savara.tools.dependencies,
  org.savara.tools.common
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-Vendor: Red Hat, Inc.
 Scribble-Extensions: org.savara.tools.bpel.editor.BPELEditorManager
-Bundle-ClassPath: .
+Bundle-ClassPath: .,
+ lib/org.savara.bpel.jar
diff --git a/plugins/org.savara.tools.bpel/build.properties b/plugins/org.savara.tools.bpel/build.properties
@@ -4,7 +4,8 @@ output.. = bin/
 bin.includes = META-INF/,\
                .,\
                plugin.xml,\
-               Copyright.txt
+               Copyright.txt,\
+               lib/
 src.includes = src/,\
                plugin.xml,\
                build.properties,\

diff --git a/plugins/org.savara.tools.bpel/pom.xml b/plugins/org.savara.tools.bpel/pom.xml
@@ -18,4 +18,48 @@
 			<version>${savara.core.version}</version>
  		</dependency>
  	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>copy-dependencies</id>
+						<phase>process-sources</phase>
+						<goals>
+							<goal>copy</goal>
+						</goals>
+						<configuration>
+							<stripVersion>true</stripVersion>
+							<outputDirectory>lib</outputDirectory>
+							<artifactItems>
+								<artifactItem>
+									<groupId>org.savara.bundles</groupId>
+									<artifactId>org.savara.bpel</artifactId>
+									<version>${savara.core.version}</version>
+								</artifactItem>
+							</artifactItems>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-clean-plugin</artifactId>
+				<configuration>
+					<filesets>
+						<fileset>
+							<directory>lib</directory>
+							<includes>
+								<include>**/*</include>
+							</includes>
+						</fileset>
+					</filesets>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+
 </project>
diff --git a/plugins/org.savara.tools.bpmn2/META-INF/MANIFEST.MF b/plugins/org.savara.tools.bpmn2/META-INF/MANIFEST.MF
@@ -17,8 +17,10 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.wst.common.frameworks,
  org.eclipse.wst.common.project.facet.core,
  org.savara.tools.scenario,
- org.savara.tools.dependencies,
  org.savara.tools.common
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Bundle-ClassPath: .
+Bundle-ClassPath: .,
+ lib/org.savara.bpmn2.jar,
+ lib/org.savara.bpmn2.model.jar,
+ lib/jaxb-impl.jar
diff --git a/plugins/org.savara.tools.bpmn2/build.properties b/plugins/org.savara.tools.bpmn2/build.properties
@@ -4,7 +4,8 @@ output.. = bin/
 bin.includes = META-INF/,\
                .,\
                plugin.xml,\
-               Copyright.txt
+               Copyright.txt,\
+               lib/
 src.includes = src/,\
                plugin.xml,\
                build.properties,\

diff --git a/plugins/org.savara.tools.bpmn2/pom.xml b/plugins/org.savara.tools.bpmn2/pom.xml
@@ -23,4 +23,58 @@
 			<version>${savara.core.version}</version>
  		</dependency>
  	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>copy-dependencies</id>
+						<phase>process-sources</phase>
+						<goals>
+							<goal>copy</goal>
+						</goals>
+						<configuration>
+							<stripVersion>true</stripVersion>
+							<outputDirectory>lib</outputDirectory>
+							<artifactItems>
+								<artifactItem>
+									<groupId>org.savara.bundles</groupId>
+									<artifactId>org.savara.bpmn2</artifactId>
+									<version>${savara.core.version}</version>
+								</artifactItem>
+								<artifactItem>
+									<groupId>org.savara.bundles</groupId>
+									<artifactId>org.savara.bpmn2.model</artifactId>
+									<version>${savara.core.version}</version>
+								</artifactItem>
+								<artifactItem>
+									<groupId>com.sun.xml.bind</groupId>
+									<artifactId>jaxb-impl</artifactId>
+									<version>${jaxbri.version}</version>
+								</artifactItem>
+							</artifactItems>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-clean-plugin</artifactId>
+				<configuration>
+					<filesets>
+						<fileset>
+							<directory>lib</directory>
+							<includes>
+								<include>**/*</include>
+							</includes>
+						</fileset>
+					</filesets>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+
 </project>
diff --git a/plugins/org.savara.tools.common/META-INF/MANIFEST.MF b/plugins/org.savara.tools.common/META-INF/MANIFEST.MF
@@ -8,13 +8,63 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.junit,
  org.apache.commons.logging,
- org.eclipse.core.resources,
- org.savara.tools.dependencies
+ org.eclipse.core.resources
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-Vendor: Red Hat, Inc.
-Export-Package: org.savara.tools.common,
+Export-Package: org.savara.common.config,
+ org.savara.common.logging,
+ org.savara.common.model.annotation,
+ org.savara.common.model.generator,
+ org.savara.common.resources,
+ org.savara.common.util,
+ org.savara.contract.model,
+ org.savara.protocol,
+ org.savara.protocol.aggregator,
+ org.savara.protocol.contract.generator,
+ org.savara.protocol.export.monitor,
+ org.savara.protocol.export.text,
+ org.savara.protocol.model,
+ org.savara.protocol.model.change,
+ org.savara.protocol.model.stateless,
+ org.savara.protocol.model.util,
+ org.savara.protocol.parser,
+ org.savara.protocol.projection,
+ org.savara.protocol.repository,
+ org.savara.protocol.util,
+ org.savara.tools.common,
  org.savara.tools.common.eclipse,
  org.savara.tools.common.generation,
- org.savara.tools.common.logging
+ org.savara.tools.common.logging,
+ org.scribble.common.logging,
+ org.scribble.common.model,
+ org.scribble.common.resource,
+ org.scribble.protocol,
+ org.scribble.protocol.conformance,
+ org.scribble.protocol.export,
+ org.scribble.protocol.export.monitor,
+ org.scribble.protocol.export.text,
+ org.scribble.protocol.model,
+ org.scribble.protocol.monitor,
+ org.scribble.protocol.monitor.model,
+ org.scribble.protocol.monitor.util,
+ org.scribble.protocol.parser,
+ org.scribble.protocol.projection,
+ org.scribble.protocol.projection.util,
+ org.scribble.protocol.util,
+ org.scribble.protocol.validation
 Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
+Bundle-ClassPath: .,
+ lib/org.scribble.command.jar,
+ lib/org.scribble.common.jar,
+ lib/org.scribble.protocol.jar,
+ lib/org.scribble.protocol.parser.jar,
+ lib/antlr-runtime.jar,
+ lib/stringtemplate.jar,
+ lib/antlr.jar,
+ lib/org.scribble.protocol.monitor.jar,
+ lib/org.scribble.protocol.conformance.jar,
+ lib/org.scribble.protocol.export.monitor.jar,
+ lib/org.scribble.protocol.projection.jar,
+ lib/org.savara.common.jar,
+ lib/org.savara.contract.jar,
+ lib/org.savara.protocol.jar
diff --git a/plugins/org.savara.tools.dependencies/Copyright.txt b/plugins/org.savara.tools.dependencies/Copyright.txt
diff --git a/plugins/org.savara.tools.dependencies/META-INF/MANIFEST.MF b/plugins/org.savara.tools.dependencies/META-INF/MANIFEST.MF
diff --git a/plugins/org.savara.tools.dependencies/build.properties b/plugins/org.savara.tools.dependencies/build.properties