You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@labs.apache.org by si...@apache.org on 2009/05/19 15:17:38 UTC
svn commit: r776302 - in /labs/magma/trunk/maven-magma-plugin: ./
src/main/java/org/apache/magma/tools/classloading/
src/main/java/org/apache/magma/tools/maven/
Author: simoneg
Date: Tue May 19 13:17:37 2009
New Revision: 776302
URL: http://svn.apache.org/viewvc?rev=776302&view=rev
Log:
LABS-362 : classloading for security subsystem and SSL
Modified:
labs/magma/trunk/maven-magma-plugin/pom.xml
labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/classloading/JettyTransformingClassLoader.java
labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/MagmaJettyRun.java
labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/MagmaTestMojo.java
Modified: labs/magma/trunk/maven-magma-plugin/pom.xml
URL: http://svn.apache.org/viewvc/labs/magma/trunk/maven-magma-plugin/pom.xml?rev=776302&r1=776301&r2=776302&view=diff
==============================================================================
--- labs/magma/trunk/maven-magma-plugin/pom.xml (original)
+++ labs/magma/trunk/maven-magma-plugin/pom.xml Tue May 19 13:17:37 2009
@@ -24,7 +24,7 @@
<groupId>org.apache.magma.tools</groupId>
<artifactId>maven-magma-plugin</artifactId>
<name>Magma Extension Mojo</name>
- <version>0.0.3-rev12</version>
+ <version>0.0.3-rev13</version>
<description>
Provides mojos to compile and test a magma package.
</description>
Modified: labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/classloading/JettyTransformingClassLoader.java
URL: http://svn.apache.org/viewvc/labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/classloading/JettyTransformingClassLoader.java?rev=776302&r1=776301&r2=776302&view=diff
==============================================================================
--- labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/classloading/JettyTransformingClassLoader.java (original)
+++ labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/classloading/JettyTransformingClassLoader.java Tue May 19 13:17:37 2009
@@ -21,6 +21,7 @@
while (name.startsWith("."))
name = name.substring(1);
if (name.startsWith("sun.")) return true;
+ if (name.startsWith("com.sun.")) return true;
String[] system_classes = context.getSystemClasses();
if (system_classes != null) {
for (int i = 0; i < system_classes.length; i++) {
Modified: labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/MagmaJettyRun.java
URL: http://svn.apache.org/viewvc/labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/MagmaJettyRun.java?rev=776302&r1=776301&r2=776302&view=diff
==============================================================================
--- labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/MagmaJettyRun.java (original)
+++ labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/MagmaJettyRun.java Tue May 19 13:17:37 2009
@@ -23,6 +23,8 @@
import java.net.URL;
import java.net.URLClassLoader;
import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
@@ -213,6 +215,10 @@
}
webapp.setExtraClasspath(jettypath.toString());
getLog().debug("Starting jetty context with classpath : " + jettypath);
+ String[] systemClasses = webapp.getSystemClasses();
+ List<String> sysclasseslist = new ArrayList<String>(Arrays.asList(systemClasses));
+ sysclasseslist.add("javax.net.");
+ webapp.setSystemClasses(sysclasseslist.toArray(new String[0]));
try {
WebAppClassLoader rootrepo = new WebAppClassLoader(webapp);
Modified: labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/MagmaTestMojo.java
URL: http://svn.apache.org/viewvc/labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/MagmaTestMojo.java?rev=776302&r1=776301&r2=776302&view=diff
==============================================================================
--- labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/MagmaTestMojo.java (original)
+++ labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/MagmaTestMojo.java Tue May 19 13:17:37 2009
@@ -867,7 +867,7 @@
}
*/
//art = (Artifact) project.getPluginArtifactMap().get(ArtifactUtils.versionlessKey( "org.apache.magma.tools", "maven-magma-plugin"));
- art = artifactFactory.createPluginArtifact("org.apache.magma.tools", "maven-magma-plugin", VersionRange.createFromVersion("0.0.3-rev12"));
+ art = artifactFactory.createPluginArtifact("org.apache.magma.tools", "maven-magma-plugin", VersionRange.createFromVersion("0.0.3-rev13"));
artifactResolver.resolve(art, project.getPluginArtifactRepositories(), localRepository);
if (art.getFile() == null) throw new ArtifactResolutionException("Cannot find file", art);
} catch (ArtifactResolutionException e) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@labs.apache.org
For additional commands, e-mail: commits-help@labs.apache.org