You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2013/04/10 21:12:04 UTC
svn commit: r1466631 - in /geronimo/server/branches/3.0: ./
framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/
framework/modules/geronimo-hook/
framework/modules/geronimo-jdbc/src/main/java/org/apache/geronimo/j...
Author: gawor
Date: Wed Apr 10 19:12:03 2013
New Revision: 1466631
URL: http://svn.apache.org/r1466631
Log:
GERONIMO-6446: Use genesis 2.1 and other changes to compile with Java 7
Modified:
geronimo/server/branches/3.0/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/InstallModulesMojo.java
geronimo/server/branches/3.0/framework/modules/geronimo-hook/pom.xml
geronimo/server/branches/3.0/framework/modules/geronimo-jdbc/src/main/java/org/apache/geronimo/jdbc/DataSourceDriver.java
geronimo/server/branches/3.0/framework/modules/geronimo-jdbc/src/main/java/org/apache/geronimo/jdbc/DelegatingDriver.java
geronimo/server/branches/3.0/framework/modules/geronimo-kernel/pom.xml
geronimo/server/branches/3.0/framework/modules/geronimo-naming/src/test/java/org/apache/geronimo/gjndi/binding/MockDataSource.java
geronimo/server/branches/3.0/plugins/aries/geronimo-aries/pom.xml
geronimo/server/branches/3.0/pom.xml
Modified: geronimo/server/branches/3.0/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/InstallModulesMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/InstallModulesMojo.java?rev=1466631&r1=1466630&r2=1466631&view=diff
==============================================================================
--- geronimo/server/branches/3.0/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/InstallModulesMojo.java (original)
+++ geronimo/server/branches/3.0/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/InstallModulesMojo.java Wed Apr 10 19:12:03 2013
@@ -20,15 +20,12 @@
package org.apache.geronimo.mavenplugins.car;
import java.io.File;
-import java.util.HashSet;
import java.util.List;
-import java.util.Set;
import java.util.Collections;
import org.apache.geronimo.kernel.Kernel;
import org.apache.geronimo.kernel.basic.BasicKernel;
import org.apache.geronimo.kernel.repository.Artifact;
-import org.apache.geronimo.system.configuration.RepositoryConfigurationStore;
import org.apache.geronimo.system.plugin.DownloadResults;
import org.apache.geronimo.system.plugin.PluginInstallerGBean;
import org.apache.geronimo.system.plugin.SourceRepository;
@@ -39,7 +36,6 @@ import org.apache.geronimo.system.plugin
import org.apache.geronimo.system.plugin.model.PluginArtifactType;
import org.apache.geronimo.system.plugin.model.PluginListType;
import org.apache.geronimo.system.plugin.model.PluginType;
-import org.apache.geronimo.system.resolver.AliasedArtifactResolver;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
@@ -64,20 +60,12 @@ public class InstallModulesMojo extends
/**
* The location of the target repository.
*
- * @parameter expression="repository"
+ * @parameter default-value="repository"
* @required
*/
private String targetRepositoryPath = null;
/**
- * The location of the target config files.
- *
- * @parameter expression="var/config"
- * @required
- */
- private String targetConfigPath = null;
-
- /**
* ServerInstance specific in plugin configuration, to specify where config.xml and properties updates go.
* @parameter
*/
@@ -101,35 +89,14 @@ public class InstallModulesMojo extends
private ArtifactRepository sourceRepository = null;
/**
- * The location where the properties mapping will be generated.
- *
- * @parameter expression="${project.build.directory}/explicit-versions.properties"
- * @required
- */
- private File explicitResolutionProperties = null;
-
- /**
* The location of the target config files.
*
- * @parameter expression="var/config/installed-plugins.properties"
+ * @parameter default-value="var/config/installed-plugins.properties"
* @required
*/
private String installedPluginsList;
/**
- * The Geronimo repository artifact resolver.
- * <p/>
- * <p/>
- * Using a custom name here to prevent problems that happen when Plexus
- * injects the Maven resolver into the base-class.
- * </p>
- */
- private AliasedArtifactResolver geronimoArtifactResolver;
-
- private RepositoryConfigurationStore sourceStore;
-
-
- /**
* @parameter expression="${project.build.directory}/classes/var/config/overrides"
* @required
*/
@@ -140,11 +107,6 @@ public class InstallModulesMojo extends
*/
private List<Override> overrides;
- /**
- * Set of artifacts which have already been installed, so we can skip any processing.
- */
- private Set installedArtifacts = new HashSet();
-
//TODO OSGI figure out what this might be
private BundleContext bundleContext;
Modified: geronimo/server/branches/3.0/framework/modules/geronimo-hook/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0/framework/modules/geronimo-hook/pom.xml?rev=1466631&r1=1466630&r2=1466631&view=diff
==============================================================================
--- geronimo/server/branches/3.0/framework/modules/geronimo-hook/pom.xml (original)
+++ geronimo/server/branches/3.0/framework/modules/geronimo-hook/pom.xml Wed Apr 10 19:12:03 2013
@@ -34,6 +34,11 @@
<dependencies>
<dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.eclipse.osgi</groupId>
<artifactId>org.eclipse.osgi</artifactId>
<scope>provided</scope>
Modified: geronimo/server/branches/3.0/framework/modules/geronimo-jdbc/src/main/java/org/apache/geronimo/jdbc/DataSourceDriver.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0/framework/modules/geronimo-jdbc/src/main/java/org/apache/geronimo/jdbc/DataSourceDriver.java?rev=1466631&r1=1466630&r2=1466631&view=diff
==============================================================================
--- geronimo/server/branches/3.0/framework/modules/geronimo-jdbc/src/main/java/org/apache/geronimo/jdbc/DataSourceDriver.java (original)
+++ geronimo/server/branches/3.0/framework/modules/geronimo-jdbc/src/main/java/org/apache/geronimo/jdbc/DataSourceDriver.java Wed Apr 10 19:12:03 2013
@@ -25,7 +25,9 @@ import java.sql.Connection;
import java.sql.SQLException;
import java.sql.DriverPropertyInfo;
import java.sql.DriverManager;
+import java.sql.SQLFeatureNotSupportedException;
import java.util.Properties;
+import java.util.logging.Logger;
import javax.sql.DataSource;
import javax.naming.Context;
@@ -87,4 +89,8 @@ public class DataSourceDriver implements
//lie shamelessly
return true;
}
+
+ public Logger getParentLogger() throws SQLFeatureNotSupportedException {
+ throw new SQLFeatureNotSupportedException();
+ }
}
Modified: geronimo/server/branches/3.0/framework/modules/geronimo-jdbc/src/main/java/org/apache/geronimo/jdbc/DelegatingDriver.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0/framework/modules/geronimo-jdbc/src/main/java/org/apache/geronimo/jdbc/DelegatingDriver.java?rev=1466631&r1=1466630&r2=1466631&view=diff
==============================================================================
--- geronimo/server/branches/3.0/framework/modules/geronimo-jdbc/src/main/java/org/apache/geronimo/jdbc/DelegatingDriver.java (original)
+++ geronimo/server/branches/3.0/framework/modules/geronimo-jdbc/src/main/java/org/apache/geronimo/jdbc/DelegatingDriver.java Wed Apr 10 19:12:03 2013
@@ -22,11 +22,13 @@ package org.apache.geronimo.jdbc;
import java.util.List;
import java.util.Properties;
import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.logging.Logger;
import java.sql.Driver;
import java.sql.Connection;
import java.sql.SQLException;
import java.sql.DriverPropertyInfo;
import java.sql.DriverManager;
+import java.sql.SQLFeatureNotSupportedException;
/**
* Class to sneak around idiotic classloading restrictions in DriverManager. This basically does the same as DriverManager
@@ -91,4 +93,8 @@ public class DelegatingDriver implements
//Lie through our teeth
return true;
}
+
+ public Logger getParentLogger() throws SQLFeatureNotSupportedException {
+ throw new SQLFeatureNotSupportedException();
+ }
}
Modified: geronimo/server/branches/3.0/framework/modules/geronimo-kernel/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0/framework/modules/geronimo-kernel/pom.xml?rev=1466631&r1=1466630&r2=1466631&view=diff
==============================================================================
--- geronimo/server/branches/3.0/framework/modules/geronimo-kernel/pom.xml (original)
+++ geronimo/server/branches/3.0/framework/modules/geronimo-kernel/pom.xml Wed Apr 10 19:12:03 2013
@@ -98,6 +98,12 @@
</dependency>
<dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.eclipse.osgi</groupId>
<artifactId>org.eclipse.osgi</artifactId>
<scope>provided</scope>
Modified: geronimo/server/branches/3.0/framework/modules/geronimo-naming/src/test/java/org/apache/geronimo/gjndi/binding/MockDataSource.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0/framework/modules/geronimo-naming/src/test/java/org/apache/geronimo/gjndi/binding/MockDataSource.java?rev=1466631&r1=1466630&r2=1466631&view=diff
==============================================================================
--- geronimo/server/branches/3.0/framework/modules/geronimo-naming/src/test/java/org/apache/geronimo/gjndi/binding/MockDataSource.java (original)
+++ geronimo/server/branches/3.0/framework/modules/geronimo-naming/src/test/java/org/apache/geronimo/gjndi/binding/MockDataSource.java Wed Apr 10 19:12:03 2013
@@ -23,6 +23,8 @@ import javax.sql.DataSource;
import java.io.PrintWriter;
import java.sql.Connection;
import java.sql.SQLException;
+import java.sql.SQLFeatureNotSupportedException;
+import java.util.logging.Logger;
/**
* @version $Rev$ $Date$
@@ -58,6 +60,10 @@ public class MockDataSource implements D
return null;
}
+ public Logger getParentLogger() throws SQLFeatureNotSupportedException {
+ throw new SQLFeatureNotSupportedException();
+ }
+
public static final GBeanInfo GBEAN_INFO;
public static GBeanInfo getGBeanInfo() {
Modified: geronimo/server/branches/3.0/plugins/aries/geronimo-aries/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0/plugins/aries/geronimo-aries/pom.xml?rev=1466631&r1=1466630&r2=1466631&view=diff
==============================================================================
--- geronimo/server/branches/3.0/plugins/aries/geronimo-aries/pom.xml (original)
+++ geronimo/server/branches/3.0/plugins/aries/geronimo-aries/pom.xml Wed Apr 10 19:12:03 2013
@@ -59,6 +59,11 @@
<artifactId>org.apache.aries.application.utils</artifactId>
</dependency>
<dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.eclipse.osgi</groupId>
<artifactId>org.eclipse.osgi</artifactId>
<scope>provided</scope>
Modified: geronimo/server/branches/3.0/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0/pom.xml?rev=1466631&r1=1466630&r2=1466631&view=diff
==============================================================================
--- geronimo/server/branches/3.0/pom.xml (original)
+++ geronimo/server/branches/3.0/pom.xml Wed Apr 10 19:12:03 2013
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.genesis</groupId>
<artifactId>genesis-java6-flava</artifactId>
- <version>2.0</version>
+ <version>2.1</version>
</parent>
<groupId>org.apache.geronimo</groupId>
@@ -1700,7 +1700,7 @@ only found in cxf
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>4.3.0</version>
+ <version>4.3.1</version>
</dependency>
<dependency>
@@ -2027,6 +2027,13 @@ only found in cxf
<version>1.0</version>
</plugin>
+ <!-- Downgrade to 2.5 as 2.8 does not include license files -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-ear-plugin</artifactId>
+ <version>2.5</version>
+ </plugin>
+
<!--
FIXME: Should not configure war to assume jsp by default
-->