Author: kono Date: 2010-08-12 17:46:16 -0700 (Thu, 12 Aug 2010) New Revision: 21374
Modified: core3/work-tunable-props-impl/trunk/pom.xml core3/work-tunable-props-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml Log: Work API was broken and all dependent modules were broken. I fixed it by re-organized the import and package name. This type of refactoring should be done by IDE. Modified: core3/work-tunable-props-impl/trunk/pom.xml =================================================================== --- core3/work-tunable-props-impl/trunk/pom.xml 2010-08-13 00:34:57 UTC (rev 21373) +++ core3/work-tunable-props-impl/trunk/pom.xml 2010-08-13 00:46:16 UTC (rev 21374) @@ -1,113 +1,124 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> - <parent> - <artifactId>parent</artifactId> - <groupId>org.cytoscape</groupId> - <version>1.0-SNAPSHOT</version> - </parent> + <parent> + <artifactId>parent</artifactId> + <groupId>org.cytoscape</groupId> + <version>1.0-SNAPSHOT</version> + </parent> - <properties> - <bundle.symbolicName>org.cytoscape.work-tunable-props-impl</bundle.symbolicName> - <bundle.namespace>org.cytoscape.work</bundle.namespace> - </properties> + <properties> + <bundle.symbolicName>org.cytoscape.work-tunable-props-impl</bundle.symbolicName> + <bundle.namespace>org.cytoscape.work</bundle.namespace> + </properties> - <modelVersion>4.0.0</modelVersion> - <groupId>org.cytoscape</groupId> - <artifactId>work-tunable-props-impl</artifactId> - <version>1.0-SNAPSHOT</version> + <modelVersion>4.0.0</modelVersion> + <groupId>org.cytoscape</groupId> + <artifactId>work-tunable-props-impl</artifactId> + <version>1.0-SNAPSHOT</version> - <name>${bundle.symbolicName}</name> + <name>${bundle.symbolicName}</name> - <packaging>bundle</packaging> + <packaging>bundle</packaging> - <repositories> - <!-- bootstrap for cytoscape dependencies, namely the parent POM snapshots --> - <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> - <!-- bootstrap for cytoscape dependencies, namely the parent POM releases --> - <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> + <repositories> + <!-- bootstrap for cytoscape dependencies, namely the parent POM snapshots --> + <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> + <!-- bootstrap for cytoscape dependencies, namely the parent POM releases --> + <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> - <resources> - <resource> - <directory>src/main/resources</directory> - </resource> - <!-- - | example additional resource entries, useful when building Eclipse RCP applications - --> - <resource> - <directory>.</directory> - <includes> - <include>plugin.xml</include> - <include>plugin.properties</include> - <include>icons/**</include> - </includes> - </resource> - </resources> - <plugins> - <plugin> - <groupId>org.ops4j</groupId> - <artifactId>maven-pax-plugin</artifactId> - <version>1.4</version> - <!-- - | enable improved OSGi compilation support for the bundle life-cycle. - | to switch back to the standard bundle life-cycle, move this setting - | down to the maven-bundle-plugin section - --> - <extensions>true</extensions> - </plugin> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <version>1.4.3</version> - <!-- - | the following instructions build a simple set of public/private classes into an OSGi bundle - --> - <configuration> - <instructions> - <Bundle-SymbolicName>${bundle.symbolicName}</Bundle-SymbolicName> - <Bundle-Version>${pom.version}</Bundle-Version> - <_include>-osgi.bnd</_include> - </instructions> - </configuration> - </plugin> - </plugins> - </build> + <build> + <resources> + <resource> + <directory>src/main/resources</directory> + </resource> + <!-- | example additional resource entries, useful when building Eclipse + RCP applications --> + <resource> + <directory>.</directory> + <includes> + <include>plugin.xml</include> + <include>plugin.properties</include> + <include>icons/**</include> + </includes> + </resource> + </resources> + <plugins> + <plugin> + <groupId>org.ops4j</groupId> + <artifactId>maven-pax-plugin</artifactId> + <version>1.4</version> + <!-- | enable improved OSGi compilation support for the bundle life-cycle. + | to switch back to the standard bundle life-cycle, move this setting | down + to the maven-bundle-plugin section --> + <extensions>true</extensions> + </plugin> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>1.4.3</version> + <!-- | the following instructions build a simple set of public/private + classes into an OSGi bundle --> + <configuration> + <instructions> + <Bundle-SymbolicName>${bundle.symbolicName}</Bundle-SymbolicName> + <Bundle-Version>${pom.version}</Bundle-Version> + <_include>-osgi.bnd</_include> + </instructions> + </configuration> + </plugin> + </plugins> + </build> - <dependencies> - <dependency> - <groupId>org.cytoscape</groupId> - <artifactId>work-api</artifactId> - <version>1.0-SNAPSHOT</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.cytoscape</groupId> - <artifactId>work-spring-hack</artifactId> - <version>1.0-SNAPSHOT</version> - <scope>provided</scope> - </dependency> - </dependencies> + <dependencies> + <dependency> + <groupId>org.cytoscape</groupId> + <artifactId>work-api</artifactId> + <version>1.0-SNAPSHOT</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.cytoscape</groupId> + <artifactId>work-spring-hack</artifactId> + <version>1.0-SNAPSHOT</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>${junit.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.springframework.osgi</groupId> + <artifactId>spring-osgi-test</artifactId> + <version>${spring.osgi.version}</version> + <scope>test</scope> + </dependency> + </dependencies> + </project> Modified: core3/work-tunable-props-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml =================================================================== --- core3/work-tunable-props-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml 2010-08-13 00:34:57 UTC (rev 21373) +++ core3/work-tunable-props-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml 2010-08-13 00:46:16 UTC (rev 21374) @@ -1,7 +1,7 @@ <?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"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:context="http://www.springframework.org/schema/context"; + xmlns:util="http://www.springframework.org/schema/util"; xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd -- 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.
