Author: mes Date: 2010-10-27 15:45:25 -0700 (Wed, 27 Oct 2010) New Revision: 22529
Added: core3/work-spring-hack/tags/work-spring-hack-3.0.0-alpha1/ core3/work-spring-hack/tags/work-spring-hack-3.0.0-alpha1/pom.xml core3/work-spring-hack/tags/work-spring-hack-3.0.0-alpha1/src/main/java/org/cytoscape/work/spring/SpringTunableInterceptor.java Removed: core3/work-spring-hack/tags/work-spring-hack-3.0.0-alpha1/pom.xml core3/work-spring-hack/tags/work-spring-hack-3.0.0-alpha1/src/main/java/org/cytoscape/work/spring/SpringTunableInterceptor.java Log: [maven-release-plugin] copy for tag work-spring-hack-3.0.0-alpha1 Copied: core3/work-spring-hack/tags/work-spring-hack-3.0.0-alpha1 (from rev 22525, core3/work-spring-hack/trunk) Deleted: core3/work-spring-hack/tags/work-spring-hack-3.0.0-alpha1/pom.xml =================================================================== --- core3/work-spring-hack/trunk/pom.xml 2010-10-27 22:33:50 UTC (rev 22525) +++ core3/work-spring-hack/tags/work-spring-hack-3.0.0-alpha1/pom.xml 2010-10-27 22:45:25 UTC (rev 22529) @@ -1,127 +0,0 @@ -<?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";> - - <parent> - <artifactId>parent</artifactId> - <groupId>org.cytoscape</groupId> - <version>3.0.0-alpha1</version> - </parent> - - <properties> - <bundle.symbolicName>org.cytoscape.work-spring-hack</bundle.symbolicName> - <bundle.namespace>org.cytoscape.work.spring</bundle.namespace> - </properties> - - <modelVersion>4.0.0</modelVersion> - <groupId>org.cytoscape</groupId> - <artifactId>work-spring-hack</artifactId> - <version>1.0-SNAPSHOT</version> - - <name>${bundle.symbolicName}</name> - - <packaging>bundle</packaging> - - <scm> - <connection>scm:svn:http://chianti.ucsd.edu/svn/core3/work-spring-hack/trunk</connection> - <developerConnection>scm:svn:svn+ssh://grenache.ucsd.edu/cellar/common/svn/core3/work-spring-hack/trunk</developerConnection> - <url>http://chianti.ucsd.edu/svn/core3/work-spring-hack/trunk</url> - </scm> - - <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> - <!-- - | assume public classes are in the top package, and private classes are under ".internal" - --> - <Export-Package>!${bundle.namespace}.internal.*,${bundle.namespace}.*;version="${pom.version}"</Export-Package> - <Private-Package>${bundle.namespace}.internal.*</Private-Package> - <!-- - | each module can override these defaults in their osgi.bnd file - --> - <_include>-osgi.bnd</_include> - </instructions> - </configuration> - </plugin> - </plugins> - </build> - - <dependencies> - <dependency> - <groupId>org.cytoscape</groupId> - <artifactId>work-api</artifactId> - <version>3.0.0-alpha1</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-core</artifactId> - <version>${spring.version}</version> - <scope>provided</scope> - </dependency> - </dependencies> - -</project> Copied: core3/work-spring-hack/tags/work-spring-hack-3.0.0-alpha1/pom.xml (from rev 22528, core3/work-spring-hack/trunk/pom.xml) =================================================================== --- core3/work-spring-hack/tags/work-spring-hack-3.0.0-alpha1/pom.xml (rev 0) +++ core3/work-spring-hack/tags/work-spring-hack-3.0.0-alpha1/pom.xml 2010-10-27 22:45:25 UTC (rev 22529) @@ -0,0 +1,127 @@ +<?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>parent</artifactId> + <groupId>org.cytoscape</groupId> + <version>3.0.0-alpha3</version> + </parent> + + <properties> + <bundle.symbolicName>org.cytoscape.work-spring-hack</bundle.symbolicName> + <bundle.namespace>org.cytoscape.work.spring</bundle.namespace> + </properties> + + <modelVersion>4.0.0</modelVersion> + <groupId>org.cytoscape</groupId> + <artifactId>work-spring-hack</artifactId> + <version>3.0.0-alpha1</version> + + <name>${bundle.symbolicName}</name> + + <packaging>bundle</packaging> + + <scm> + <connection>scm:svn:http://chianti.ucsd.edu/svn/core3/work-spring-hack/tags/work-spring-hack-3.0.0-alpha1</connection> + <developerConnection>scm:svn:svn+ssh://grenache.ucsd.edu/cellar/common/svn/core3/work-spring-hack/tags/work-spring-hack-3.0.0-alpha1</developerConnection> + <url>http://chianti.ucsd.edu/svn/core3/work-spring-hack/tags/work-spring-hack-3.0.0-alpha1</url> + </scm> + + <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> + <!-- + | assume public classes are in the top package, and private classes are under ".internal" + --> + <Export-Package>!${bundle.namespace}.internal.*,${bundle.namespace}.*;version="${pom.version}"</Export-Package> + <Private-Package>${bundle.namespace}.internal.*</Private-Package> + <!-- + | each module can override these defaults in their osgi.bnd file + --> + <_include>-osgi.bnd</_include> + </instructions> + </configuration> + </plugin> + </plugins> + </build> + + <dependencies> + <dependency> + <groupId>org.cytoscape</groupId> + <artifactId>work-api</artifactId> + <version>3.0.0-alpha1</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> + <version>${spring.version}</version> + <scope>provided</scope> + </dependency> + </dependencies> + +</project> Deleted: core3/work-spring-hack/tags/work-spring-hack-3.0.0-alpha1/src/main/java/org/cytoscape/work/spring/SpringTunableInterceptor.java =================================================================== --- core3/work-spring-hack/trunk/src/main/java/org/cytoscape/work/spring/SpringTunableInterceptor.java 2010-10-27 22:33:50 UTC (rev 22525) +++ core3/work-spring-hack/tags/work-spring-hack-3.0.0-alpha1/src/main/java/org/cytoscape/work/spring/SpringTunableInterceptor.java 2010-10-27 22:45:25 UTC (rev 22529) @@ -1,45 +0,0 @@ -package org.cytoscape.work.spring; - - -import org.cytoscape.work.AbstractTunableInterceptor; -import org.cytoscape.work.TunableHandler; -import org.cytoscape.work.TunableHandlerFactory; - -import org.springframework.core.InfrastructureProxy; - - -/** - * This hack exists to handle Spring's proxy framework. Since Spring returns - * a proxy object rather than the original object when requesting an OSGi - * service, we need this check to get at the original object where tunables - * are actually defined. This code can be safely omitted if this class isn't - * being used with Spring. - */ -public abstract class SpringTunableInterceptor<T extends TunableHandler> extends AbstractTunableInterceptor<T> { - public SpringTunableInterceptor(TunableHandlerFactory<T> hf) { - super(hf); - } - - final public void loadTunables(final Object obj) { - if (obj instanceof InfrastructureProxy) - super.loadTunables(((InfrastructureProxy)obj).getWrappedObject()); - else - super.loadTunables( obj ); - } - - final protected Object convertSpringProxyObj(final Object o) { - if (o instanceof InfrastructureProxy) - return ((InfrastructureProxy)o).getWrappedObject(); - else - return o; - } - - final protected Object[] convertSpringProxyObjs(final Object... proxyObjs) { - final Object[] objs = new Object[proxyObjs.length]; - int i = 0; - for (final Object o : proxyObjs) - objs[i++] = convertSpringProxyObj(o); - - return objs; - } -} Copied: core3/work-spring-hack/tags/work-spring-hack-3.0.0-alpha1/src/main/java/org/cytoscape/work/spring/SpringTunableInterceptor.java (from rev 22527, core3/work-spring-hack/trunk/src/main/java/org/cytoscape/work/spring/SpringTunableInterceptor.java) =================================================================== --- core3/work-spring-hack/tags/work-spring-hack-3.0.0-alpha1/src/main/java/org/cytoscape/work/spring/SpringTunableInterceptor.java (rev 0) +++ core3/work-spring-hack/tags/work-spring-hack-3.0.0-alpha1/src/main/java/org/cytoscape/work/spring/SpringTunableInterceptor.java 2010-10-27 22:45:25 UTC (rev 22529) @@ -0,0 +1,61 @@ +package org.cytoscape.work.spring; + + +import org.cytoscape.work.AbstractTunableInterceptor; +import org.cytoscape.work.TunableHandler; +import org.cytoscape.work.TunableHandlerFactory; + +import org.springframework.core.InfrastructureProxy; + + +/** + * This hack exists to handle Spring's proxy framework. Since Spring returns + * a proxy object rather than the original object when requesting an OSGi + * service, we need this check to get at the original object where tunables + * are actually defined. This code can be safely omitted if this class isn't + * being used with Spring. + */ +public abstract class SpringTunableInterceptor<T extends TunableHandler> extends AbstractTunableInterceptor<T> { + public SpringTunableInterceptor(TunableHandlerFactory<T> hf) { + super(hf); + } + + /** + * This method calls {...@link AbstractTunableInterceptor.loadTunables} with the + * unwrapped object instead of the Spring proxy object, which is provided as + * an argument. + * @param obj The Spring proxy object from which we'd like the raw object. + */ + final public void loadTunables(final Object obj) { + if (obj instanceof InfrastructureProxy) + super.loadTunables(((InfrastructureProxy)obj).getWrappedObject()); + else + super.loadTunables( obj ); + } + + /** + * This method returns the raw, unwrapped object from the Spring proxy object. + * @param o The Spring proxy object from which we'd like the raw object. + * @return The raw, unwrapped object from the Spring proxy object. + */ + final protected Object convertSpringProxyObj(final Object o) { + if (o instanceof InfrastructureProxy) + return ((InfrastructureProxy)o).getWrappedObject(); + else + return o; + } + + /** + * This method returns the raw, unwrapped objects from the Spring proxy objects. + * @param proxyObjs The Spring proxy objects from which we'd like the raw objects. + * @return An array of raw, unwrapped objects from the Spring proxy objects. + */ + final protected Object[] convertSpringProxyObjs(final Object... proxyObjs) { + final Object[] objs = new Object[proxyObjs.length]; + int i = 0; + for (final Object o : proxyObjs) + objs[i++] = convertSpringProxyObj(o); + + return objs; + } +} -- 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.
