Author: kono Date: 2012-05-17 14:04:30 -0700 (Thu, 17 May 2012) New Revision: 29291
Added: core3/impl/trunk/session-impl/impl/ core3/impl/trunk/session-impl/impl/pom.xml core3/impl/trunk/session-impl/impl/src/ core3/impl/trunk/session-impl/integration-test/ core3/impl/trunk/session-impl/integration-test/pom.xml core3/impl/trunk/session-impl/integration-test/src/ core3/impl/trunk/session-impl/integration-test/src/test/ core3/impl/trunk/session-impl/integration-test/src/test/java/ core3/impl/trunk/session-impl/integration-test/src/test/java/org/ core3/impl/trunk/session-impl/integration-test/src/test/java/org/cytoscape/ core3/impl/trunk/session-impl/integration-test/src/test/java/org/cytoscape/session/ core3/impl/trunk/session-impl/integration-test/src/test/java/org/cytoscape/session/SessionLoadingTest.java core3/impl/trunk/session-impl/integration-test/src/test/java/org/cytoscape/session/SessionSavingTest.java Removed: core3/impl/trunk/session-impl/src/ Modified: core3/impl/trunk/session-impl/pom.xml Log: Integration test module template had been added to session-impl. Property changes on: core3/impl/trunk/session-impl/impl ___________________________________________________________________ Added: svn:ignore + target .classpath .project .settings Copied: core3/impl/trunk/session-impl/impl/pom.xml (from rev 29232, core3/impl/trunk/session-impl/pom.xml) =================================================================== --- core3/impl/trunk/session-impl/impl/pom.xml (rev 0) +++ core3/impl/trunk/session-impl/impl/pom.xml 2012-05-17 21:04:30 UTC (rev 29291) @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + + <parent> + <artifactId>session-impl-parent</artifactId> + <groupId>org.cytoscape</groupId> + <version>3.0.0-alpha9-SNAPSHOT</version> + </parent> + + <properties> + <bundle.symbolicName>org.cytoscape.session-impl</bundle.symbolicName> + <bundle.namespace>org.cytoscape.session.internal</bundle.namespace> + </properties> + + <modelVersion>4.0.0</modelVersion> + <groupId>org.cytoscape</groupId> + <artifactId>session-impl</artifactId> + + <name>Cytoscape Session Impl (${project.artifactId})</name> + + <packaging>bundle</packaging> + + + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>${maven-bundle-plugin.version}</version> + <extensions>true</extensions> + <configuration> + <instructions> + <Bundle-SymbolicName>${bundle.symbolicName}</Bundle-SymbolicName> + <Bundle-Version>${project.version}</Bundle-Version> + <Export-Package>!${bundle.namespace}.*</Export-Package> + <Private-Package>${bundle.namespace}.*</Private-Package> + <Bundle-Activator>${bundle.namespace}.CyActivator</Bundle-Activator> + </instructions> + </configuration> + </plugin> + </plugins> + </build> + + <repositories> + <repository> + <id>cytoscape_snapshots</id> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>false</enabled> + </releases> + <name>Cytoscape Snapshots</name> + <url>http://code.cytoscape.org/nexus/content/repositories/snapshots/</url> + </repository> + <repository> + <id>cytoscape_releases</id> + <snapshots> + <enabled>false</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + </releases> + <name>Cytoscape Releases</name> + <url>http://code.cytoscape.org/nexus/content/repositories/releases/</url> + </repository> + </repositories> +</project> Added: core3/impl/trunk/session-impl/integration-test/pom.xml =================================================================== --- core3/impl/trunk/session-impl/integration-test/pom.xml (rev 0) +++ core3/impl/trunk/session-impl/integration-test/pom.xml 2012-05-17 21:04:30 UTC (rev 29291) @@ -0,0 +1,61 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + + <parent> + <artifactId>session-impl-parent</artifactId> + <groupId>org.cytoscape</groupId> + <version>3.0.0-alpha9-SNAPSHOT</version> + </parent> + + <properties> + <bundle.symbolicName>org.cytoscape.session-impl-integration-test</bundle.symbolicName> + <bundle.namespace>org.cytoscape.session</bundle.namespace> + </properties> + + <modelVersion>4.0.0</modelVersion> + <groupId>org.cytoscape</groupId> + <artifactId>session-impl-integration-test</artifactId> + + <name>Cytoscape Session Impl Integration Test (${project.artifactId})</name> + + <packaging>jar</packaging> + + <build> + <plugins> + <plugin> + <groupId>org.ops4j.pax.exam</groupId> + <artifactId>maven-paxexam-plugin</artifactId> + <version>${maven-paxexam-plugin.version}</version> + <executions> + <execution> + <id>generate-config</id> + <goals> + <goal>generate-config</goal> + </goals> + </execution> + </executions> + <configuration> + <options> + <platform>felix</platform> + <version>${felix.version}</version> + <profiles>spring.dm/${spring.osgi.version}</profiles> + </options> + </configuration> + </plugin> + </plugins> + </build> + + <!-- + This is where any additional implementation dependencies necessary for + running the integration tests should reside, NOT in the top level pom.xml. + --> + <dependencies> + <dependency> + <groupId>org.cytoscape</groupId> + <artifactId>session-impl</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> + </dependencies> +</project> + Added: core3/impl/trunk/session-impl/integration-test/src/test/java/org/cytoscape/session/SessionLoadingTest.java =================================================================== --- core3/impl/trunk/session-impl/integration-test/src/test/java/org/cytoscape/session/SessionLoadingTest.java (rev 0) +++ core3/impl/trunk/session-impl/integration-test/src/test/java/org/cytoscape/session/SessionLoadingTest.java 2012-05-17 21:04:30 UTC (rev 29291) @@ -0,0 +1,23 @@ +package org.cytoscape.session; + +import static org.junit.Assert.*; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +public class SessionLoadingTest { + + @Before + public void setUp() throws Exception { + } + + @After + public void tearDown() throws Exception { + } + + @Test + public void test() { + } + +} Added: core3/impl/trunk/session-impl/integration-test/src/test/java/org/cytoscape/session/SessionSavingTest.java =================================================================== --- core3/impl/trunk/session-impl/integration-test/src/test/java/org/cytoscape/session/SessionSavingTest.java (rev 0) +++ core3/impl/trunk/session-impl/integration-test/src/test/java/org/cytoscape/session/SessionSavingTest.java 2012-05-17 21:04:30 UTC (rev 29291) @@ -0,0 +1,23 @@ +package org.cytoscape.session; + +import static org.junit.Assert.*; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +public class SessionSavingTest { + + @Before + public void setUp() throws Exception { + } + + @After + public void tearDown() throws Exception { + } + + @Test + public void test() { + } + +} Modified: core3/impl/trunk/session-impl/pom.xml =================================================================== --- core3/impl/trunk/session-impl/pom.xml 2012-05-17 20:51:23 UTC (rev 29290) +++ core3/impl/trunk/session-impl/pom.xml 2012-05-17 21:04:30 UTC (rev 29291) @@ -1,46 +1,20 @@ -<?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - + <modelVersion>4.0.0</modelVersion> <parent> + <groupId>org.cytoscape</groupId> <artifactId>impl-parent</artifactId> - <groupId>org.cytoscape</groupId> <version>3.0.0-alpha9-SNAPSHOT</version> </parent> - <properties> - <bundle.symbolicName>org.cytoscape.session-impl</bundle.symbolicName> - <bundle.namespace>org.cytoscape.session.internal</bundle.namespace> - </properties> + <artifactId>session-impl-parent</artifactId> + <packaging>pom</packaging> + <name>Cytoscape Session Impl Parent (${project.artifactId})</name> + + <modules> + <module>impl</module> + <module>integration-test</module> + </modules> - <modelVersion>4.0.0</modelVersion> - <groupId>org.cytoscape</groupId> - <artifactId>session-impl</artifactId> - - <name>Cytoscape Session Impl (${project.artifactId})</name> - - <packaging>bundle</packaging> - - - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <version>${maven-bundle-plugin.version}</version> - <extensions>true</extensions> - <configuration> - <instructions> - <Bundle-SymbolicName>${bundle.symbolicName}</Bundle-SymbolicName> - <Bundle-Version>${project.version}</Bundle-Version> - <Export-Package>!${bundle.namespace}.*</Export-Package> - <Private-Package>${bundle.namespace}.*</Private-Package> - <Bundle-Activator>${bundle.namespace}.CyActivator</Bundle-Activator> - </instructions> - </configuration> - </plugin> - </plugins> - </build> - <repositories> <repository> <id>cytoscape_snapshots</id> @@ -66,7 +40,26 @@ </repository> </repositories> + <build> + <plugins> + <plugin> + <inherited>false</inherited> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-release-plugin</artifactId> + <version>${maven-release-plugin.version}</version> + <configuration> + <autoVersionSubmodules>true</autoVersionSubmodules> + <goals>deploy</goals> + <!-- so that impl bundles with modules will build correctly --> + <preparationGoals>clean install</preparationGoals> + </configuration> + </plugin> + </plugins> + </build> + <!-- Dependencies included here should *ONLY* be for the impl bundle. All + additional dependencies necessary for the integration tests (it) should be + kept in the it/pom.xml --> <dependencies> <dependency> <groupId>org.cytoscape</groupId> @@ -90,5 +83,17 @@ <scope>test</scope> <type>test-jar</type> </dependency> + + <!-- for testing --> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-all</artifactId> + <scope>test</scope> + </dependency> </dependencies> </project> -- 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.
