Author: kono Date: 2011-05-11 15:11:58 -0700 (Wed, 11 May 2011) New Revision: 25011
Added: core3/archetypes/trunk/bundle-plugin/ core3/archetypes/trunk/bundle-plugin/pom.xml core3/archetypes/trunk/bundle-plugin/src/ core3/archetypes/trunk/bundle-plugin/src/main/ core3/archetypes/trunk/bundle-plugin/src/main/resources/ core3/archetypes/trunk/bundle-plugin/src/main/resources/META-INF/ core3/archetypes/trunk/bundle-plugin/src/main/resources/META-INF/maven/ core3/archetypes/trunk/bundle-plugin/src/main/resources/META-INF/maven/archetype-metadata.xml core3/archetypes/trunk/bundle-plugin/src/main/resources/archetype-resources/ core3/archetypes/trunk/bundle-plugin/src/main/resources/archetype-resources/.classpath core3/archetypes/trunk/bundle-plugin/src/main/resources/archetype-resources/.project core3/archetypes/trunk/bundle-plugin/src/main/resources/archetype-resources/.settings/ core3/archetypes/trunk/bundle-plugin/src/main/resources/archetype-resources/.settings/org.eclipse.jdt.core.prefs core3/archetypes/trunk/bundle-plugin/src/main/resources/archetype-resources/.settings/org.maven.ide.eclipse.prefs core3/archetypes/trunk/bundle-plugin/src/main/resources/archetype-resources/osgi.bnd core3/archetypes/trunk/bundle-plugin/src/main/resources/archetype-resources/pom.xml core3/archetypes/trunk/bundle-plugin/src/main/resources/archetype-resources/src/ core3/archetypes/trunk/bundle-plugin/src/main/resources/archetype-resources/src/main/ core3/archetypes/trunk/bundle-plugin/src/main/resources/archetype-resources/src/main/java/ core3/archetypes/trunk/bundle-plugin/src/main/resources/archetype-resources/src/main/java/Cy3Plugin.java core3/archetypes/trunk/bundle-plugin/src/main/resources/archetype-resources/src/main/java/internal/ core3/archetypes/trunk/bundle-plugin/src/main/resources/archetype-resources/src/main/java/internal/Cy3PluginImpl.java core3/archetypes/trunk/bundle-plugin/src/main/resources/archetype-resources/src/main/resources/ core3/archetypes/trunk/bundle-plugin/src/main/resources/archetype-resources/src/main/resources/META-INF/ core3/archetypes/trunk/bundle-plugin/src/main/resources/archetype-resources/src/main/resources/META-INF/spring/ core3/archetypes/trunk/bundle-plugin/src/main/resources/archetype-resources/src/main/resources/META-INF/spring/bundle-context-osgi.xml core3/archetypes/trunk/bundle-plugin/src/main/resources/archetype-resources/src/main/resources/META-INF/spring/bundle-context.xml core3/archetypes/trunk/bundle-plugin/src/main/resources/archetype-resources/src/test/ core3/archetypes/trunk/bundle-plugin/src/main/resources/archetype-resources/src/test/java/ core3/archetypes/trunk/bundle-plugin/src/main/resources/archetype-resources/src/test/java/internal/ core3/archetypes/trunk/bundle-plugin/src/main/resources/archetype-resources/src/test/java/internal/Cy3PluginImplTest.java core3/archetypes/trunk/bundle-plugin/src/test/ core3/archetypes/trunk/bundle-plugin/src/test/resources/ core3/archetypes/trunk/bundle-plugin/src/test/resources/projects/ core3/archetypes/trunk/bundle-plugin/src/test/resources/projects/basic/ core3/archetypes/trunk/bundle-plugin/src/test/resources/projects/basic/archetype.properties core3/archetypes/trunk/bundle-plugin/src/test/resources/projects/basic/goal.txt Modified: core3/archetypes/trunk/api-provider-plugin/pom.xml core3/archetypes/trunk/pom.xml core3/archetypes/trunk/task-plugin/ core3/archetypes/trunk/task-plugin/pom.xml core3/archetypes/trunk/task-plugin/src/main/resources/META-INF/maven/archetype.xml Log: New simple template archetype for Cytoscape 3 had been created. Modified: core3/archetypes/trunk/api-provider-plugin/pom.xml =================================================================== --- core3/archetypes/trunk/api-provider-plugin/pom.xml 2011-05-11 20:14:56 UTC (rev 25010) +++ core3/archetypes/trunk/api-provider-plugin/pom.xml 2011-05-11 22:11:58 UTC (rev 25011) @@ -1,87 +1,37 @@ -<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";> +<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> + <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.cytoscape</groupId> - <artifactId>archetypes-parent</artifactId> - <version>3.0.0-alpha1-SNAPSHOT</version> - </parent> + <parent> + <groupId>org.cytoscape</groupId> + <artifactId>archetypes-parent</artifactId> + <version>${parent.version}</version> + </parent> - <groupId>org.cytoscape.archetypes</groupId> - <artifactId>api-provider-plugin</artifactId> - <packaging>maven-archetype</packaging> - <name>Archetype - Cytoscape API Provider Plugin</name> + <groupId>org.cytoscape.archetypes</groupId> + <artifactId>api-provider-plugin</artifactId> + <packaging>maven-archetype</packaging> + <name>Archetype - API Provider Plugin</name> - <build> - <extensions> - <extension> - <groupId>org.apache.maven.archetype</groupId> - <artifactId>archetype-packaging</artifactId> - <version>2.0-alpha-5</version> - </extension> - </extensions> - <plugins> - <plugin> - <artifactId>maven-archetype-plugin</artifactId> - <version>2.0-alpha-5</version> - <extensions>true</extensions> - </plugin> - <!-- - The point of this code is to use the archetype we just - created and use it to generate a project and then build - the project, which will test that our archetype still - works. - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-invoker-plugin</artifactId> - <executions> - <execution> - <id>integration-test</id> - <goals> - <goal>install</goal> - <goal>run</goal> - </goals> - </execution> - </executions> - <configuration> - <cloneProjectsTo>${project.build.directory}/it/projects</cloneProjectsTo> - <goals> - <goal>org.apache.maven.plugins:maven-archetype-plugin:generate</goal> - </goals> - <localRepositoryPath>${project.build.directory}/it/repo</localRepositoryPath> - <pomIncludes> - <pomInclude>*</pomInclude> - </pomIncludes> - <projectsDirectory>${basedir}/src/it/projects</projectsDirectory> - <postBuildHookScript>verify.bsh</postBuildHookScript> - <properties> - <archetypeArtifactId>${project.artifactId}</archetypeArtifactId> - <archetypeGroupId>${project.groupId}</archetypeGroupId> - <archetypeRepository>local</archetypeRepository> - <archetypeVersion>${project.version}</archetypeVersion> - <goals>verify</goals> - <interactiveMode>false</interactiveMode> - </properties> - <streamLogs>true</streamLogs> - </configuration> - </plugin> - <plugin> - <artifactId>maven-clean-plugin</artifactId> - <version>2.4.1</version> - <executions> - <execution> - <id>auto-clean</id> - <phase>initialize</phase> - <goals> - <goal>clean</goal> - </goals> - </execution> - </executions> - </plugin> - --> - </plugins> - </build> + <build> + <plugins> + <!-- The point of this code is to use the archetype we just created and + use it to generate a project and then build the project, which will test + that our archetype still works. <plugin> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-invoker-plugin</artifactId> <executions> <execution> <id>integration-test</id> + <goals> <goal>install</goal> <goal>run</goal> </goals> </execution> </executions> + <configuration> <cloneProjectsTo>${project.build.directory}/it/projects</cloneProjectsTo> + <goals> <goal>org.apache.maven.plugins:maven-archetype-plugin:generate</goal> + </goals> <localRepositoryPath>${project.build.directory}/it/repo</localRepositoryPath> + <pomIncludes> <pomInclude>*</pomInclude> </pomIncludes> <projectsDirectory>${basedir}/src/it/projects</projectsDirectory> + <postBuildHookScript>verify.bsh</postBuildHookScript> <properties> <archetypeArtifactId>${project.artifactId}</archetypeArtifactId> + <archetypeGroupId>${project.groupId}</archetypeGroupId> <archetypeRepository>local</archetypeRepository> + <archetypeVersion>${project.version}</archetypeVersion> <goals>verify</goals> + <interactiveMode>false</interactiveMode> </properties> <streamLogs>true</streamLogs> + </configuration> </plugin> <plugin> <artifactId>maven-clean-plugin</artifactId> + <version>2.4.1</version> <executions> <execution> <id>auto-clean</id> <phase>initialize</phase> + <goals> <goal>clean</goal> </goals> </execution> </executions> </plugin> --> + </plugins> + </build> </project> Added: core3/archetypes/trunk/bundle-plugin/pom.xml =================================================================== --- core3/archetypes/trunk/bundle-plugin/pom.xml (rev 0) +++ core3/archetypes/trunk/bundle-plugin/pom.xml 2011-05-11 22:11:58 UTC (rev 25011) @@ -0,0 +1,37 @@ +<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>archetypes-parent</artifactId> + <version>${parent.version}</version> + </parent> + + <groupId>org.cytoscape.archetypes</groupId> + <artifactId>bundle-plugin</artifactId> + <packaging>maven-archetype</packaging> + <name>Archetype - Bundle Plugin Template</name> + + <build> + <plugins> + <!-- The point of this code is to use the archetype we just created and + use it to generate a project and then build the project, which will test + that our archetype still works. <plugin> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-invoker-plugin</artifactId> <executions> <execution> <id>integration-test</id> + <goals> <goal>install</goal> <goal>run</goal> </goals> </execution> </executions> + <configuration> <cloneProjectsTo>${project.build.directory}/it/projects</cloneProjectsTo> + <goals> <goal>org.apache.maven.plugins:maven-archetype-plugin:generate</goal> + </goals> <localRepositoryPath>${project.build.directory}/it/repo</localRepositoryPath> + <pomIncludes> <pomInclude>*</pomInclude> </pomIncludes> <projectsDirectory>${basedir}/src/it/projects</projectsDirectory> + <postBuildHookScript>verify.bsh</postBuildHookScript> <properties> <archetypeArtifactId>${project.artifactId}</archetypeArtifactId> + <archetypeGroupId>${project.groupId}</archetypeGroupId> <archetypeRepository>local</archetypeRepository> + <archetypeVersion>${project.version}</archetypeVersion> <goals>verify</goals> + <interactiveMode>false</interactiveMode> </properties> <streamLogs>true</streamLogs> + </configuration> </plugin> <plugin> <artifactId>maven-clean-plugin</artifactId> + <version>2.4.1</version> <executions> <execution> <id>auto-clean</id> <phase>initialize</phase> + <goals> <goal>clean</goal> </goals> </execution> </executions> </plugin> --> + </plugins> + </build> +</project> Added: core3/archetypes/trunk/bundle-plugin/src/main/resources/META-INF/maven/archetype-metadata.xml =================================================================== --- core3/archetypes/trunk/bundle-plugin/src/main/resources/META-INF/maven/archetype-metadata.xml (rev 0) +++ core3/archetypes/trunk/bundle-plugin/src/main/resources/META-INF/maven/archetype-metadata.xml 2011-05-11 22:11:58 UTC (rev 25011) @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="UTF-8"?> +<archetype-descriptor xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0 http://maven.apache.org/xsd/archetype-descriptor-1.0.0.xsd"; name="bundle-plugin" + xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> + <fileSets> + <fileSet filtered="true" packaged="true" encoding="UTF-8"> + <directory>src/main/java</directory> + <includes> + <include>**/*.java</include> + </includes> + </fileSet> + <fileSet filtered="true" encoding="UTF-8"> + <directory>src/main/resources</directory> + <includes> + <include>**/*.xml</include> + </includes> + </fileSet> + <fileSet filtered="true" packaged="true" encoding="UTF-8"> + <directory>src/test/java</directory> + <includes> + <include>**/*.java</include> + </includes> + </fileSet> + <fileSet encoding="UTF-8"> + <directory>.settings</directory> + <includes> + <include>**/*.prefs</include> + </includes> + </fileSet> + <fileSet filtered="true" encoding="UTF-8"> + <directory></directory> + <includes> + <include>.classpath</include> + <include>.project</include> + </includes> + </fileSet> + <fileSet encoding="UTF-8"> + <directory></directory> + <includes> + <include>osgi.bnd</include> + </includes> + </fileSet> + </fileSets> +</archetype-descriptor> Added: core3/archetypes/trunk/bundle-plugin/src/main/resources/archetype-resources/.classpath =================================================================== --- core3/archetypes/trunk/bundle-plugin/src/main/resources/archetype-resources/.classpath (rev 0) +++ core3/archetypes/trunk/bundle-plugin/src/main/resources/archetype-resources/.classpath 2011-05-11 22:11:58 UTC (rev 25011) @@ -0,0 +1,12 @@ +#set( $symbol_pound = '#' ) +#set( $symbol_dollar = '$' ) +#set( $symbol_escape = '\' ) +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" output="target/classes" path="src/main/java"/> + <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/> + <classpathentry kind="src" output="target/test-classes" path="src/test/java"/> + <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="output" path="target/classes"/> +</classpath> Added: core3/archetypes/trunk/bundle-plugin/src/main/resources/archetype-resources/.project =================================================================== --- core3/archetypes/trunk/bundle-plugin/src/main/resources/archetype-resources/.project (rev 0) +++ core3/archetypes/trunk/bundle-plugin/src/main/resources/archetype-resources/.project 2011-05-11 22:11:58 UTC (rev 25011) @@ -0,0 +1,27 @@ +#set( $symbol_pound = '#' ) +#set( $symbol_dollar = '$' ) +#set( $symbol_escape = '\' ) +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>${artifactId}</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.maven.ide.eclipse.maven2Builder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.maven.ide.eclipse.maven2Nature</nature> + </natures> +</projectDescription> Added: core3/archetypes/trunk/bundle-plugin/src/main/resources/archetype-resources/.settings/org.eclipse.jdt.core.prefs =================================================================== --- core3/archetypes/trunk/bundle-plugin/src/main/resources/archetype-resources/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ core3/archetypes/trunk/bundle-plugin/src/main/resources/archetype-resources/.settings/org.eclipse.jdt.core.prefs 2011-05-11 22:11:58 UTC (rev 25011) @@ -0,0 +1,3 @@ +#Wed May 11 14:35:53 PDT 2011 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning Added: core3/archetypes/trunk/bundle-plugin/src/main/resources/archetype-resources/.settings/org.maven.ide.eclipse.prefs =================================================================== --- core3/archetypes/trunk/bundle-plugin/src/main/resources/archetype-resources/.settings/org.maven.ide.eclipse.prefs (rev 0) +++ core3/archetypes/trunk/bundle-plugin/src/main/resources/archetype-resources/.settings/org.maven.ide.eclipse.prefs 2011-05-11 22:11:58 UTC (rev 25011) @@ -0,0 +1,8 @@ +#Wed May 11 14:34:53 PDT 2011 +activeProfiles= +eclipse.preferences.version=1 +fullBuildGoals=process-test-resources +resolveWorkspaceProjects=true +resourceFilterGoals=process-resources resources\:testResources +skipCompilerPlugin=true +version=1 Added: core3/archetypes/trunk/bundle-plugin/src/main/resources/archetype-resources/osgi.bnd =================================================================== --- core3/archetypes/trunk/bundle-plugin/src/main/resources/archetype-resources/osgi.bnd (rev 0) +++ core3/archetypes/trunk/bundle-plugin/src/main/resources/archetype-resources/osgi.bnd 2011-05-11 22:11:58 UTC (rev 25011) @@ -0,0 +1,7 @@ +#----------------------------------------------------------------- +# Use this file to add customized Bnd instructions for the bundle +#----------------------------------------------------------------- + +Import-Package: * +Private-Package: ${bundle.namespace}.internal.* +Export-Package: ${bundle.namespace} Added: core3/archetypes/trunk/bundle-plugin/src/main/resources/archetype-resources/pom.xml =================================================================== --- core3/archetypes/trunk/bundle-plugin/src/main/resources/archetype-resources/pom.xml (rev 0) +++ core3/archetypes/trunk/bundle-plugin/src/main/resources/archetype-resources/pom.xml 2011-05-11 22:11:58 UTC (rev 25011) @@ -0,0 +1,105 @@ +<?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";> + + <properties> + <bundle.symbolicName>org.cytoscape.bundle-plugin</bundle.symbolicName> + <bundle.namespace>org.cytoscape.plugin</bundle.namespace> + </properties> + + <modelVersion>4.0.0</modelVersion> + <groupId>${groupId}</groupId> + <artifactId>${artifactId}</artifactId> + <version>${version}</version> + + <name>${bundle.symbolicName} [${bundle.namespace}]</name> + + <packaging>bundle</packaging> + + <build> + <resources> + <resource> + <directory>src/main/resources</directory> + </resource> + </resources> + <!-- Cytoscape requires Java 1.6 --> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.6</source> + <target>1.6</target> + <optimize>true</optimize> + <showWarnings>true</showWarnings> + <showDeprecation>true</showDeprecation> + <compilerArguments> + <Xmaxwarns>10000</Xmaxwarns> + <Xmaxerrs>10000</Xmaxerrs> + </compilerArguments> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <redirectTestOutputToFile>true</redirectTestOutputToFile> + </configuration> + </plugin> + <plugin> + <groupId>org.ops4j</groupId> + <artifactId>maven-pax-plugin</artifactId> + <version>1.5-SNAPSHOT</version> + <extensions>true</extensions> + </plugin> + <!-- Generates the OSGi metadata based on the osgi.bnd file. --> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-${rootArtifactId}</artifactId> + <version>${version}</version> + <configuration> + <instructions> + <Bundle-SymbolicName>${bundle.symbolicName}</Bundle-SymbolicName> + <Bundle-Version>${pom.version}</Bundle-Version> + <_include>-osgi.bnd</_include> + </instructions> + </configuration> + </plugin> + </plugins> + </build> + + <!-- Links to the Cytoscape Maven repositories. --> + <repositories> + <repository> + <id>cytoscape_snapshots</id> + <snapshots> + </snapshots> + <releases> + <enabled>false</enabled> + </releases> + <name>Cytoscape Snapshots</name> + <url>http://cytoscape.wodaklab.org/nexus/content/repositories/snapshots/</url> + </repository> + <repository> + <id>cytoscape_releases</id> + <snapshots> + <enabled>false</enabled> + </snapshots> + <releases> + </releases> + <name>Cytoscape Releases</name> + <url>http://cytoscape.wodaklab.org/nexus/content/repositories/releases/</url> + </repository> + </repositories> + + <!-- Dependencies needed to compile this project. --> + <dependencies> + <!-- dependencies specifically for unit testing --> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.8.2</version> + <scope>test</scope> + </dependency> + </dependencies> + +</project> Added: core3/archetypes/trunk/bundle-plugin/src/main/resources/archetype-resources/src/main/java/Cy3Plugin.java =================================================================== --- core3/archetypes/trunk/bundle-plugin/src/main/resources/archetype-resources/src/main/java/Cy3Plugin.java (rev 0) +++ core3/archetypes/trunk/bundle-plugin/src/main/resources/archetype-resources/src/main/java/Cy3Plugin.java 2011-05-11 22:11:58 UTC (rev 25011) @@ -0,0 +1,10 @@ +#set( $symbol_pound = '#' ) +#set( $symbol_dollar = '$' ) +#set( $symbol_escape = '\' ) +package ${package}; + +public interface Cy3Plugin { + + void doSomething(); + +} Added: core3/archetypes/trunk/bundle-plugin/src/main/resources/archetype-resources/src/main/java/internal/Cy3PluginImpl.java =================================================================== --- core3/archetypes/trunk/bundle-plugin/src/main/resources/archetype-resources/src/main/java/internal/Cy3PluginImpl.java (rev 0) +++ core3/archetypes/trunk/bundle-plugin/src/main/resources/archetype-resources/src/main/java/internal/Cy3PluginImpl.java 2011-05-11 22:11:58 UTC (rev 25011) @@ -0,0 +1,14 @@ +#set( $symbol_pound = '#' ) +#set( $symbol_dollar = '$' ) +#set( $symbol_escape = '\' ) +package ${package}.internal; + +import ${package}.Cy3Plugin; + +public class Cy3PluginImpl implements Cy3Plugin { + + public void doSomething() { + + } + +} Added: core3/archetypes/trunk/bundle-plugin/src/main/resources/archetype-resources/src/main/resources/META-INF/spring/bundle-context-osgi.xml =================================================================== --- core3/archetypes/trunk/bundle-plugin/src/main/resources/archetype-resources/src/main/resources/META-INF/spring/bundle-context-osgi.xml (rev 0) +++ core3/archetypes/trunk/bundle-plugin/src/main/resources/archetype-resources/src/main/resources/META-INF/spring/bundle-context-osgi.xml 2011-05-11 22:11:58 UTC (rev 25011) @@ -0,0 +1,20 @@ +#set( $symbol_pound = '#' ) +#set( $symbol_dollar = '$' ) +#set( $symbol_escape = '\' ) +<?xml version="1.0" encoding="UTF-8"?> +<beans xmlns="http://www.springframework.org/schema/beans"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xmlns:osgi="http://www.springframework.org/schema/osgi"; + xsi:schemaLocation=" + http://www.springframework.org/schema/beans + http://www.springframework.org/schema/beans/spring-beans-2.5.xsd + http://www.springframework.org/schema/osgi + http://www.springframework.org/schema/osgi/spring-osgi-1.0.xsd"; + default-lazy-init="false"> + + + <osgi:service id="cy3PluginService" ref="cy3Plugin" + interface="${package}.Cy3Plugin"> + </osgi:service> + +</beans> Added: core3/archetypes/trunk/bundle-plugin/src/main/resources/archetype-resources/src/main/resources/META-INF/spring/bundle-context.xml =================================================================== --- core3/archetypes/trunk/bundle-plugin/src/main/resources/archetype-resources/src/main/resources/META-INF/spring/bundle-context.xml (rev 0) +++ core3/archetypes/trunk/bundle-plugin/src/main/resources/archetype-resources/src/main/resources/META-INF/spring/bundle-context.xml 2011-05-11 22:11:58 UTC (rev 25011) @@ -0,0 +1,19 @@ +#set( $symbol_pound = '#' ) +#set( $symbol_dollar = '$' ) +#set( $symbol_escape = '\' ) +<?xml version="1.0" encoding="UTF-8"?> +<beans xmlns="http://www.springframework.org/schema/beans"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xmlns:context="http://www.springframework.org/schema/context"; + xsi:schemaLocation=" + http://www.springframework.org/schema/beans + http://www.springframework.org/schema/beans/spring-beans-2.5.xsd + http://www.springframework.org/schema/context + http://www.springframework.org/schema/context/spring-context-2.5.xsd";> + + + <bean id="cy3Plugin" + class="${package}.internal.Cy3PluginImpl"> + </bean> + +</beans> Added: core3/archetypes/trunk/bundle-plugin/src/main/resources/archetype-resources/src/test/java/internal/Cy3PluginImplTest.java =================================================================== --- core3/archetypes/trunk/bundle-plugin/src/main/resources/archetype-resources/src/test/java/internal/Cy3PluginImplTest.java (rev 0) +++ core3/archetypes/trunk/bundle-plugin/src/main/resources/archetype-resources/src/test/java/internal/Cy3PluginImplTest.java 2011-05-11 22:11:58 UTC (rev 25011) @@ -0,0 +1,20 @@ +#set( $symbol_pound = '#' ) +#set( $symbol_dollar = '$' ) +#set( $symbol_escape = '\' ) +package ${package}.internal; + + +import org.junit.After; +import org.junit.Before; + +public class Cy3PluginImplTest { + + @Before + public void setUp() throws Exception { + } + + @After + public void tearDown() throws Exception { + } + +} Added: core3/archetypes/trunk/bundle-plugin/src/test/resources/projects/basic/archetype.properties =================================================================== --- core3/archetypes/trunk/bundle-plugin/src/test/resources/projects/basic/archetype.properties (rev 0) +++ core3/archetypes/trunk/bundle-plugin/src/test/resources/projects/basic/archetype.properties 2011-05-11 22:11:58 UTC (rev 25011) @@ -0,0 +1,4 @@ +#Wed May 11 14:50:38 PDT 2011 +version=0.1-SNAPSHOT +groupId=archetype.it +artifactId=basic Added: core3/archetypes/trunk/bundle-plugin/src/test/resources/projects/basic/goal.txt =================================================================== Modified: core3/archetypes/trunk/pom.xml =================================================================== --- core3/archetypes/trunk/pom.xml 2011-05-11 20:14:56 UTC (rev 25010) +++ core3/archetypes/trunk/pom.xml 2011-05-11 22:11:58 UTC (rev 25011) @@ -1,81 +1,64 @@ -<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>parent</artifactId> - <version>3.0.0-alpha6-SNAPSHOT</version> - </parent> +<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>parent</artifactId> + <version>3.0.0-alpha6-SNAPSHOT</version> + </parent> - <groupId>org.cytoscape</groupId> - <artifactId>archetypes-parent</artifactId> - <packaging>pom</packaging> - <version>3.0.0-alpha1-SNAPSHOT</version> - <name>Archetypes Parent</name> + <!-- These values should be used in child modules! --> + <properties> + <parent.groupId>org.cytoscape</parent.groupId> + <parent.version>3.0.0-alpha2-SNAPSHOT</parent.version> + </properties> - <modules> - <module>api-provider-plugin</module> - <module>task-plugin</module> - </modules> + <groupId>org.cytoscape</groupId> + <artifactId>archetypes-parent</artifactId> + <packaging>pom</packaging> + <version>${parent.version}</version> + <name>Cytoscape 3 Plugin Archetypes Parent</name> - <scm> - <connection>scm:svn:http://chianti.ucsd.edu/svn/core3/archetypes/trunk</connection> - <developerConnection>scm:svn:svn+ssh://grenache.ucsd.edu/cellar/common/svn/core3/archetypes/trunk</developerConnection> - <url>http://chianti.ucsd.edu/svn/core3/archetypes/trunk</url> - </scm> + <modules> + <module>api-provider-plugin</module> + <module>task-plugin</module> + <module>bundle-plugin</module> + </modules> - <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> + <scm> + <connection>scm:svn:http://chianti.ucsd.edu/svn/core3/archetypes/trunk</connection> + <developerConnection>scm:svn:svn+ssh://grenache.ucsd.edu/cellar/common/svn/core3/archetypes/trunk</developerConnection> + <url>http://chianti.ucsd.edu/svn/core3/archetypes/trunk</url> + </scm> - <repositories> - <repository> - <id>cytoscape_snapshots</id> - <snapshots> - <enabled>true</enabled> - </snapshots> - <releases> - <enabled>false</enabled> - </releases> - <name>Cytoscape Snapshots</name> - <url>http://cytoscape.wodaklab.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://cytoscape.wodaklab.org/nexus/content/repositories/releases/</url> - </repository> - </repositories> + <build> + <extensions> + <extension> + <groupId>org.apache.maven.archetype</groupId> + <artifactId>archetype-packaging</artifactId> + <version>2.0</version> + </extension> + </extensions> + <plugins> + <plugin> + <artifactId>maven-archetype-plugin</artifactId> + <version>2.0</version> + <extensions>true</extensions> + </plugin> + <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> - <distributionManagement> - <repository> - <id>releases</id> - <name>Internal Releases</name> - <url>http://cytoscape.wodaklab.org/nexus/content/repositories/releases</url> - </repository> - <snapshotRepository> - <id>snapshots</id> - <name>Internal Snapshots</name> - <url>http://cytoscape.wodaklab.org/nexus/content/repositories/snapshots</url> - </snapshotRepository> - </distributionManagement> - </project> Property changes on: core3/archetypes/trunk/task-plugin ___________________________________________________________________ Added: svn:ignore + target .classpath .project .settings Modified: core3/archetypes/trunk/task-plugin/pom.xml =================================================================== --- core3/archetypes/trunk/task-plugin/pom.xml 2011-05-11 20:14:56 UTC (rev 25010) +++ core3/archetypes/trunk/task-plugin/pom.xml 2011-05-11 22:11:58 UTC (rev 25011) @@ -1,87 +1,37 @@ <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";> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> - <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.cytoscape</groupId> + <artifactId>archetypes-parent</artifactId> + <version>${parent.version}</version> + </parent> - <parent> - <groupId>org.cytoscape</groupId> - <artifactId>archetypes-parent</artifactId> - <version>3.0.0-alpha1-SNAPSHOT</version> - </parent> + <groupId>org.cytoscape.archetypes</groupId> + <artifactId>task-plugin</artifactId> + <packaging>maven-archetype</packaging> + <name>Archetype - Cytoscape Task Plugin</name> - <groupId>org.cytoscape.archetypes</groupId> - <artifactId>task-plugin</artifactId> - <packaging>maven-archetype</packaging> - <name>Archetype - Cytoscape Task Plugin</name> - - <build> - <extensions> - <extension> - <groupId>org.apache.maven.archetype</groupId> - <artifactId>archetype-packaging</artifactId> - <version>2.0-alpha-5</version> - </extension> - </extensions> - <plugins> - <plugin> - <artifactId>maven-archetype-plugin</artifactId> - <version>2.0-alpha-5</version> - <extensions>true</extensions> - </plugin> - <!-- - The point of this code is to use the archetype we just - created and use it to generate a project and then build - the project, which will test that our archetype still - works. - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-invoker-plugin</artifactId> - <executions> - <execution> - <id>integration-test</id> - <goals> - <goal>install</goal> - <goal>run</goal> - </goals> - </execution> - </executions> - <configuration> - <cloneProjectsTo>${project.build.directory}/it/projects</cloneProjectsTo> - <goals> - <goal>org.apache.maven.plugins:maven-archetype-plugin:generate</goal> - </goals> - <localRepositoryPath>${project.build.directory}/it/repo</localRepositoryPath> - <pomIncludes> - <pomInclude>*</pomInclude> - </pomIncludes> - <projectsDirectory>${basedir}/src/it/projects</projectsDirectory> - <postBuildHookScript>verify.bsh</postBuildHookScript> - <properties> - <archetypeArtifactId>${project.artifactId}</archetypeArtifactId> - <archetypeGroupId>${project.groupId}</archetypeGroupId> - <archetypeRepository>local</archetypeRepository> - <archetypeVersion>${project.version}</archetypeVersion> - <goals>verify</goals> - <interactiveMode>false</interactiveMode> - </properties> - <streamLogs>true</streamLogs> - </configuration> - </plugin> - <plugin> - <artifactId>maven-clean-plugin</artifactId> - <version>2.4.1</version> - <executions> - <execution> - <id>auto-clean</id> - <phase>initialize</phase> - <goals> - <goal>clean</goal> - </goals> - </execution> - </executions> - </plugin> - --> - </plugins> - </build> + <build> + <plugins> + <!-- The point of this code is to use the archetype we just created and + use it to generate a project and then build the project, which will test + that our archetype still works. <plugin> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-invoker-plugin</artifactId> <executions> <execution> <id>integration-test</id> + <goals> <goal>install</goal> <goal>run</goal> </goals> </execution> </executions> + <configuration> <cloneProjectsTo>${project.build.directory}/it/projects</cloneProjectsTo> + <goals> <goal>org.apache.maven.plugins:maven-archetype-plugin:generate</goal> + </goals> <localRepositoryPath>${project.build.directory}/it/repo</localRepositoryPath> + <pomIncludes> <pomInclude>*</pomInclude> </pomIncludes> <projectsDirectory>${basedir}/src/it/projects</projectsDirectory> + <postBuildHookScript>verify.bsh</postBuildHookScript> <properties> <archetypeArtifactId>${project.artifactId}</archetypeArtifactId> + <archetypeGroupId>${project.groupId}</archetypeGroupId> <archetypeRepository>local</archetypeRepository> + <archetypeVersion>${project.version}</archetypeVersion> <goals>verify</goals> + <interactiveMode>false</interactiveMode> </properties> <streamLogs>true</streamLogs> + </configuration> </plugin> <plugin> <artifactId>maven-clean-plugin</artifactId> + <version>2.4.1</version> <executions> <execution> <id>auto-clean</id> <phase>initialize</phase> + <goals> <goal>clean</goal> </goals> </execution> </executions> </plugin> --> + </plugins> + </build> </project> Modified: core3/archetypes/trunk/task-plugin/src/main/resources/META-INF/maven/archetype.xml =================================================================== --- core3/archetypes/trunk/task-plugin/src/main/resources/META-INF/maven/archetype.xml 2011-05-11 20:14:56 UTC (rev 25010) +++ core3/archetypes/trunk/task-plugin/src/main/resources/META-INF/maven/archetype.xml 2011-05-11 22:11:58 UTC (rev 25011) @@ -1,15 +1,17 @@ <archetype> - <id>task-plugin</id> - <sources> - <source>src/main/java/internal/SampleTask.java</source> - <source>src/main/java/internal/SampleTaskFactory.java</source> - </sources> - <testSources> - <source>src/test/java/internal/SampleTaskTest.java</source> - </testSources> - <resources> - <resource>osgi.bnd</resource> - <resource>src/main/resources/META-INF/spring/bundle-context.xml</resource> - <resource>src/main/resources/META-INF/spring/bundle-context-osgi.xml</resource> - </resources> + <id>task-plugin</id> + <sources> + <source>src/main/java/internal/SampleTask.java</source> + <source>src/main/java/internal/SampleTaskFactory.java</source> + </sources> + <testSources> + <source>src/test/java/internal/SampleTaskTest.java</source> + </testSources> + <resources> + <resource>osgi.bnd</resource> + <resource>src/main/resources/META-INF/spring/bundle-context.xml + </resource> + <resource>src/main/resources/META-INF/spring/bundle-context-osgi.xml + </resource> + </resources> </archetype> -- 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.
