Author: jm
Date: 2010-10-20 10:53:22 -0700 (Wed, 20 Oct 2010)
New Revision: 22315
Added:
core3/sbml-impl/trunk/osgi.bnd
core3/sbml-impl/trunk/pom.xml
core3/sbml-impl/trunk/src/
Removed:
core3/sbml-impl/osgi.bnd
core3/sbml-impl/pom.xml
core3/sbml-impl/src/
Log:
Moved everything into trunk
Deleted: core3/sbml-impl/osgi.bnd
===================================================================
--- core3/sbml-impl/osgi.bnd 2010-10-20 17:52:00 UTC (rev 22314)
+++ core3/sbml-impl/osgi.bnd 2010-10-20 17:53:22 UTC (rev 22315)
@@ -1,7 +0,0 @@
-#-----------------------------------------------------------------
-# Use this file to add customized Bnd instructions for the bundle
-#-----------------------------------------------------------------
-
-Spring-Context: META-INF/spring/*.xml
-Private-Package: ${bundle.namespace}.internal.*
-Export-Package:
!${bundle.namespace}.internal.*,${bundle.namespace}.*;version="${pom.version}"
Deleted: core3/sbml-impl/pom.xml
===================================================================
--- core3/sbml-impl/pom.xml 2010-10-20 17:52:00 UTC (rev 22314)
+++ core3/sbml-impl/pom.xml 2010-10-20 17:53:22 UTC (rev 22315)
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";
- xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
- <parent>
- <groupId>org.cytoscape</groupId>
- <artifactId>parent</artifactId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- <properties>
-
<bundle.symbolicName>org.cytoscape.sbml-impl</bundle.symbolicName>
- <bundle.namespace>org.cytoscape.sbml</bundle.namespace>
- </properties>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.cytoscape</groupId>
- <artifactId>sbml-impl</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>${bundle.symbolicName}
- [${bundle.namespace}]</name>
- <packaging>bundle</packaging>
- <dependencies>
- <dependency>
- <groupId>cytoscape</groupId>
- <artifactId>application</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>cytoscape-temp</groupId>
- <artifactId>jsbml</artifactId>
- <version>0.8</version>
- </dependency>
- <dependency>
- <groupId>cytoscape-temp</groupId>
- <artifactId>biojava</artifactId>
- <version>1.7.1</version>
- </dependency>
- <dependency>
- <groupId>cytoscape-temp</groupId>
- <artifactId>jigsaw</artifactId>
- <version>2.2.6</version>
- </dependency>
- <dependency>
- <groupId>cytoscape-temp</groupId>
- <artifactId>stax-api</artifactId>
- <version>1.0.1</version>
- </dependency>
- <dependency>
- <groupId>cytoscape-temp</groupId>
- <artifactId>stax2-api</artifactId>
- <version>3.0.1</version>
- </dependency>
- <dependency>
- <groupId>cytoscape-temp</groupId>
- <artifactId>staxmate</artifactId>
- <version>2.0.0</version>
- </dependency>
- <dependency>
- <groupId>cytoscape-temp</groupId>
- <artifactId>woodstox-core-lgpl</artifactId>
- <version>4.0.5</version>
- </dependency>
- <dependency>
- <groupId>cytoscape-temp</groupId>
- <artifactId>xstream</artifactId>
- <version>1.3.1</version>
- </dependency>
-
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi_R4_core</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi_R4_compendium</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.cytoscape</groupId>
- <artifactId>test-support</artifactId>
- <version>1.0-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <version>1.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <repositories>
- <repository>
- <id>cytoscape_thirdparty</id>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- <name>Wrapped Third Party Libraries</name>
-
<url>http://cytoscape.wodaklab.org/nexus/content/repositories/thirdparty/</url>
- </repository>
- </repositories>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.ops4j</groupId>
- <artifactId>maven-pax-plugin</artifactId>
- <version>1.4</version>
- <extensions>true</extensions>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.3</version>
- <configuration>
- <instructions>
-
<Bundle-SymbolicName>${bundle.symbolicName}</Bundle-SymbolicName>
-
<Bundle-Version>${pom.version}</Bundle-Version>
- <_include>-osgi.bnd</_include>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
\ No newline at end of file
Copied: core3/sbml-impl/trunk/osgi.bnd (from rev 22313,
core3/sbml-impl/osgi.bnd)
===================================================================
--- core3/sbml-impl/trunk/osgi.bnd (rev 0)
+++ core3/sbml-impl/trunk/osgi.bnd 2010-10-20 17:53:22 UTC (rev 22315)
@@ -0,0 +1,7 @@
+#-----------------------------------------------------------------
+# Use this file to add customized Bnd instructions for the bundle
+#-----------------------------------------------------------------
+
+Spring-Context: META-INF/spring/*.xml
+Private-Package: ${bundle.namespace}.internal.*
+Export-Package:
!${bundle.namespace}.internal.*,${bundle.namespace}.*;version="${pom.version}"
Copied: core3/sbml-impl/trunk/pom.xml (from rev 22313, core3/sbml-impl/pom.xml)
===================================================================
--- core3/sbml-impl/trunk/pom.xml (rev 0)
+++ core3/sbml-impl/trunk/pom.xml 2010-10-20 17:53:22 UTC (rev 22315)
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";
+ xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+ <parent>
+ <groupId>org.cytoscape</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+ <properties>
+
<bundle.symbolicName>org.cytoscape.sbml-impl</bundle.symbolicName>
+ <bundle.namespace>org.cytoscape.sbml</bundle.namespace>
+ </properties>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.cytoscape</groupId>
+ <artifactId>sbml-impl</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <name>${bundle.symbolicName}
+ [${bundle.namespace}]</name>
+ <packaging>bundle</packaging>
+ <dependencies>
+ <dependency>
+ <groupId>cytoscape</groupId>
+ <artifactId>application</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>cytoscape-temp</groupId>
+ <artifactId>jsbml</artifactId>
+ <version>0.8</version>
+ </dependency>
+ <dependency>
+ <groupId>cytoscape-temp</groupId>
+ <artifactId>biojava</artifactId>
+ <version>1.7.1</version>
+ </dependency>
+ <dependency>
+ <groupId>cytoscape-temp</groupId>
+ <artifactId>jigsaw</artifactId>
+ <version>2.2.6</version>
+ </dependency>
+ <dependency>
+ <groupId>cytoscape-temp</groupId>
+ <artifactId>stax-api</artifactId>
+ <version>1.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>cytoscape-temp</groupId>
+ <artifactId>stax2-api</artifactId>
+ <version>3.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>cytoscape-temp</groupId>
+ <artifactId>staxmate</artifactId>
+ <version>2.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>cytoscape-temp</groupId>
+ <artifactId>woodstox-core-lgpl</artifactId>
+ <version>4.0.5</version>
+ </dependency>
+ <dependency>
+ <groupId>cytoscape-temp</groupId>
+ <artifactId>xstream</artifactId>
+ <version>1.3.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi_R4_core</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi_R4_compendium</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.cytoscape</groupId>
+ <artifactId>test-support</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-all</artifactId>
+ <version>1.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <repositories>
+ <repository>
+ <id>cytoscape_thirdparty</id>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <name>Wrapped Third Party Libraries</name>
+
<url>http://cytoscape.wodaklab.org/nexus/content/repositories/thirdparty/</url>
+ </repository>
+ </repositories>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.ops4j</groupId>
+ <artifactId>maven-pax-plugin</artifactId>
+ <version>1.4</version>
+ <extensions>true</extensions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>1.4.3</version>
+ <configuration>
+ <instructions>
+
<Bundle-SymbolicName>${bundle.symbolicName}</Bundle-SymbolicName>
+
<Bundle-Version>${pom.version}</Bundle-Version>
+ <_include>-osgi.bnd</_include>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
Copied: core3/sbml-impl/trunk/src (from rev 22313, core3/sbml-impl/src)
--
You received this message because you are subscribed to the Google Groups
"cytoscape-cvs" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/cytoscape-cvs?hl=en.
