You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2011/04/27 01:19:00 UTC
svn commit: r1096951 [6/6] - in /geronimo/server/trunk: ./ framework/
framework/assemblies/ framework/assemblies/geronimo-framework/
framework/buildsupport/car-maven-plugin/src/main/filtered-resources/resources/etc/
framework/buildsupport/car-maven-plu...
Modified: geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/basic/BasicKernel.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/basic/BasicKernel.java?rev=1096951&r1=1096950&r2=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/basic/BasicKernel.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/basic/BasicKernel.java Tue Apr 26 23:18:49 2011
@@ -77,7 +77,8 @@ import org.osgi.framework.BundleContext;
*/
@Component
@Service
-public class BasicKernel implements Kernel
+public class
+ BasicKernel implements Kernel
{
private static final Logger log = LoggerFactory.getLogger(BasicKernel.class);
@@ -129,7 +130,7 @@ public class BasicKernel implements Kern
/**
* This factory gbean proxies, and tracks all proxies in the system
*/
- private ProxyManager proxyManager = new BasicProxyManager(this);;
+// private ProxyManager proxyManager = new BasicProxyManager(this);
private static final Naming INSTANCE = new Jsr77Naming();
@@ -224,7 +225,7 @@ public class BasicKernel implements Kern
* @deprecated don't use this yet... it may change or go away
*/
public ProxyManager getProxyManager() {
- return proxyManager;
+ return null;
}
public Object getAttribute(ObjectName objectName, String attributeName) throws GBeanNotFoundException, NoSuchAttributeException, Exception {
@@ -621,19 +622,13 @@ public class BasicKernel implements Kern
return null;
}
- // check if service is a proxy
- AbstractName name = proxyManager.getProxyTarget(service);
- if (name != null) {
- return name;
- }
-
// try the registry
GBeanInstance gbeanInstance = registry.getGBeanInstanceByInstance(service);
if (gbeanInstance != null) {
return gbeanInstance.getAbstractName();
}
- // didn't fing the name
+ // didn't find the name
return null;
}
Modified: geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/ConfigurationUtil.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/ConfigurationUtil.java?rev=1096951&r1=1096950&r2=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/ConfigurationUtil.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/ConfigurationUtil.java Tue Apr 26 23:18:49 2011
@@ -356,7 +356,11 @@ public final class ConfigurationUtil {
throw new IllegalStateException("More than one Configuration Manager was found in the kernel");
}
AbstractName configurationManagerName = (AbstractName) names.iterator().next();
- return kernel.getProxyManager().createProxy(configurationManagerName, EditableConfigurationManager.class);
+ try {
+ return (EditableConfigurationManager) kernel.getGBean(configurationManagerName);
+ } catch (GBeanNotFoundException e) {
+ return null;
+ }
}
public static void releaseConfigurationManager(Kernel kernel, ConfigurationManager configurationManager) {
Modified: geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/util/FileUtils.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/util/FileUtils.java?rev=1096951&r1=1096950&r2=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/util/FileUtils.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/util/FileUtils.java Tue Apr 26 23:18:49 2011
@@ -30,7 +30,6 @@ import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.net.MalformedURLException;
import java.net.URL;
-import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.Enumeration;
@@ -38,7 +37,6 @@ import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.LinkedList;
-import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.jar.JarFile;
@@ -83,7 +81,6 @@ public class FileUtils {
File tempDir = File.createTempFile("geronimo-fileutils", ".tmpdir");
tempDir.delete();
tempDir.mkdirs();
- deleteOnExit(tempDir);
return tempDir;
}
@@ -412,37 +409,4 @@ public class FileUtils {
private FileUtils() {
}
-
- // Shutdown hook for recurssive delete on tmp directories
- static final List<String> delete = new ArrayList<String>();
-
- static {
- Runtime.getRuntime().addShutdownHook(new Thread(){
- @Override
- public void run() {
- delete();
- }
- });
- }
-
- private static void deleteOnExit(File file) {
- delete.add(file.getAbsolutePath());
- }
-
- private static void delete() {
- for (String path : delete) {
- delete(new File(path));
- }
- }
-
- private static void delete(File file) {
- if (file.isDirectory()) {
- for (File f : file.listFiles()) {
- delete(f);
- }
- }
-
- file.delete();
- }
-
}
Modified: geronimo/server/trunk/framework/modules/geronimo-management/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-management/pom.xml?rev=1096951&r1=1096950&r2=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-management/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-management/pom.xml Tue Apr 26 23:18:49 2011
@@ -43,11 +43,11 @@
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-pax-logging</artifactId>
- <version>${project.version}</version>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>org.apache.geronimo.framework</groupId>-->
+ <!--<artifactId>geronimo-pax-logging</artifactId>-->
+ <!--<version>${project.version}</version>-->
+ <!--</dependency>-->
<!-- needed by geronimo-jaxrpc_1.1_spec -->
<dependency>
Modified: geronimo/server/trunk/framework/modules/geronimo-management/src/main/java/org/apache/geronimo/management/geronimo/JVM.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-management/src/main/java/org/apache/geronimo/management/geronimo/JVM.java?rev=1096951&r1=1096950&r2=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-management/src/main/java/org/apache/geronimo/management/geronimo/JVM.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-management/src/main/java/org/apache/geronimo/management/geronimo/JVM.java Tue Apr 26 23:18:49 2011
@@ -20,7 +20,7 @@ package org.apache.geronimo.management.g
import java.util.Date;
import java.util.Properties;
-import org.apache.geronimo.logging.SystemLog;
+//import org.apache.geronimo.logging.SystemLog;
/**
* Geronimo extensions to the standard JSR-77 JVM type.
@@ -42,6 +42,6 @@ public interface JVM extends org.apache.
/**
* Gets the system log instance
*/
- SystemLog getSystemLog();
+// SystemLog getSystemLog();
}
Modified: geronimo/server/trunk/framework/modules/geronimo-naming/src/test/java/org/apache/geronimo/gjndi/binding/GBeanBindingTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-naming/src/test/java/org/apache/geronimo/gjndi/binding/GBeanBindingTest.java?rev=1096951&r1=1096950&r2=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-naming/src/test/java/org/apache/geronimo/gjndi/binding/GBeanBindingTest.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-naming/src/test/java/org/apache/geronimo/gjndi/binding/GBeanBindingTest.java Tue Apr 26 23:18:49 2011
@@ -70,7 +70,8 @@ public class GBeanBindingTest extends Ab
kernel.startGBean(ds2Name);
DataSource ds2 = (DataSource) kernel.getGBean(ds2Name);
globalBindings.put("writable/ds2", ds2);
- assertEq(globalBindings, ctx); */
+ assertEq(globalBindings, ctx);
+ */
}
protected Map getNestedBindings(Map globalBindings, String nestedPath) {
Modified: geronimo/server/trunk/framework/modules/geronimo-pax-logging/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-pax-logging/pom.xml?rev=1096951&r1=1096950&r2=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-pax-logging/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-pax-logging/pom.xml Tue Apr 26 23:18:49 2011
@@ -96,11 +96,13 @@
org.w3c.dom,
org.xml.sax,
org.xml.sax.helpers,
+
+ org.apache.geronimo.main.*;resolution:=optional,
*
</Import-Package>
<Export-Package>
org.apache.geronimo.logging,
- org.ops4j.pax.logging.spi;provider=paxlogging;version=${pax.logging.version}
+ org.ops4j.pax.logging.spi;provider=paxlogging;version="1.6.1"
</Export-Package>
<Bundle-Activator>org.apache.geronimo.logging.impl.LoggingServiceActivator</Bundle-Activator>
<Include-Resource>
Modified: geronimo/server/trunk/framework/modules/geronimo-security/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-security/pom.xml?rev=1096951&r1=1096950&r2=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-security/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-security/pom.xml Tue Apr 26 23:18:49 2011
@@ -68,7 +68,7 @@
<dependency>
<groupId>org.apache.karaf.jaas</groupId>
<artifactId>org.apache.karaf.jaas.boot</artifactId>
- <!--<scope>provided</scope>-->
+ <scope>provided</scope>
</dependency>
<dependency>
@@ -109,6 +109,20 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Import-Package>
+ javax.ejb.*;resolution:=optional,
+ javax.servlet.*;resolution:=optional,
+ javax.xml.soap.*;resolution:=optional,
+ *
+ </Import-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
Modified: geronimo/server/trunk/framework/modules/geronimo-service-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-service-builder/pom.xml?rev=1096951&r1=1096950&r2=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-service-builder/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-service-builder/pom.xml Tue Apr 26 23:18:49 2011
@@ -49,6 +49,11 @@
<!--<artifactId>geronimo-schema-j2ee_1.4</artifactId>-->
<!--</dependency>-->
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.scr.annotations</artifactId>
+ </dependency>
+
<!-- g-kernel, g-common is coming from this via geronimo-system -->
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
Modified: geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java?rev=1096951&r1=1096950&r2=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java Tue Apr 26 23:18:49 2011
@@ -116,9 +116,10 @@ public class ServiceConfigBuilder implem
if (planFile != null) {
InputStream in = new FileInputStream(planFile);
try {
+// moduleType = JaxbUtil.unmarshal(ModuleType.class, in, false);
moduleType = JaxbUtil.unmarshalModule(in, false);
- } catch (XMLStreamException e) {
- return null;
+// } catch (XMLStreamException e) {
+// return null;
} catch (JAXBException e) {
return null;
} finally {
@@ -130,6 +131,7 @@ public class ServiceConfigBuilder implem
try {
InputStream in = path.openStream();
try {
+// moduleType = JaxbUtil.unmarshal(ModuleType.class, in, false);
moduleType = JaxbUtil.unmarshalModule(in, false);
} finally {
in.close();
@@ -161,21 +163,21 @@ public class ServiceConfigBuilder implem
// }
// XmlBeansUtil.validateDD(moduleDoc);
// If there's no artifact ID and we won't be able to figure one out later, use the plan file name. Bit of a hack.
- if(jarFile == null && (moduleType.getEnvironment() == null ||
- moduleType.getEnvironment().getModuleId() == null ||
- moduleType.getEnvironment().getModuleId().getArtifactId() == null)) {
- if(moduleType.getEnvironment() == null) {
-// moduleType.addNewEnvironment();
+ if(jarFile == null) {
+ if (moduleType.getEnvironment() == null) {
+ moduleType.setEnvironment(new EnvironmentType());
}
- if(moduleType.getEnvironment().getModuleId() == null) {
-// moduleType.getEnvironment().addNewModuleId();
+ if (moduleType.getEnvironment().getModuleId() == null) {
+ moduleType.getEnvironment().setModuleId(new ArtifactType());
}
- String name = planFile.getName();
- int pos = name.lastIndexOf('.');
- if(pos > -1) {
- name = name.substring(0, pos);
+ if (moduleType.getEnvironment().getModuleId().getArtifactId() == null) {
+ String name = planFile.getName();
+ int pos = name.lastIndexOf('.');
+ if(pos > -1) {
+ name = name.substring(0, pos);
+ }
+ moduleType.getEnvironment().getModuleId().setArtifactId(name);
}
- moduleType.getEnvironment().getModuleId().setArtifactId(name);
}
return moduleType;
} catch (Exception e) {
Modified: geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/service/SingleGBeanBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/service/SingleGBeanBuilder.java?rev=1096951&r1=1096950&r2=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/service/SingleGBeanBuilder.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/service/SingleGBeanBuilder.java Tue Apr 26 23:18:49 2011
@@ -163,11 +163,11 @@ public class SingleGBeanBuilder {
public static AbstractNameQuery buildAbstractNameQuery(PatternType pattern, String nameTypeName, Set interfaceTypes) {
String groupId = pattern.getGroupId();
- String artifactid = pattern.getArtifactId().trim();
- String version = pattern.getVersion().trim();
- String module = pattern.getModule().trim();
- String type = pattern.getType().trim();
- String name = pattern.getName().trim();
+ String artifactid = pattern.getArtifactId();
+ String version = pattern.getVersion();
+ String module = pattern.getModule();
+ String type = pattern.getType();
+ String name = pattern.getName();
Artifact artifact = artifactid != null? new Artifact(groupId, artifactid, version, "car"): null;
//get the type from the gbean info if not supplied explicitly
Modified: geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/service/plan/JaxbUtil.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/service/plan/JaxbUtil.java?rev=1096951&r1=1096950&r2=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/service/plan/JaxbUtil.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/service/plan/JaxbUtil.java Tue Apr 26 23:18:49 2011
@@ -80,6 +80,13 @@ public class JaxbUtil {
return javabeanType;
}
+ public static void marshalModule(ModuleType object, Writer out) throws JAXBException {
+ Marshaller marshaller = MODULE_CONTEXT.createMarshaller();
+
+ marshaller.setProperty("jaxb.formatted.output", true);
+
+ marshaller.marshal(object, out);
+ }
public static <T> void marshal(Class<T> type, Object object, Writer out) throws JAXBException {
JAXBContext ctx2 = JAXBContext.newInstance(type);
Marshaller marshaller = ctx2.createMarshaller();
@@ -90,6 +97,30 @@ public class JaxbUtil {
}
+ public static ModuleType unmarshalModule2(InputStream in, boolean validate) throws ParserConfigurationException, SAXException, JAXBException {
+ InputSource inputSource = new InputSource(in);
+
+ SAXParserFactory factory = SAXParserFactory.newInstance();
+ factory.setNamespaceAware(true);
+ factory.setValidating(validate);
+ SAXParser parser = factory.newSAXParser();
+
+ Unmarshaller unmarshaller = MODULE_CONTEXT.createUnmarshaller();
+ unmarshaller.setEventHandler(new ValidationEventHandler() {
+ public boolean handleEvent(ValidationEvent validationEvent) {
+ System.out.println(validationEvent);
+ return false;
+ }
+ });
+
+ XMLFilter xmlFilter = new NoSourceFilter(parser.getXMLReader());
+ xmlFilter.setContentHandler(unmarshaller.getUnmarshallerHandler());
+
+ SAXSource source = new SAXSource(xmlFilter, inputSource);
+
+ return ModuleType.class.cast(unmarshaller.unmarshal(source));
+ }
+
/**
* Read in a T from the input stream.
*
@@ -141,12 +172,12 @@ public class JaxbUtil {
@Override
public void startElement(String uri, String localName, String qname, Attributes atts) throws SAXException {
- super.startElement("http://karaf.apache.org/xmlns/features/v1.0.0", localName, qname, atts);
+ super.startElement("http://geronimo.apache.org/xml/ns/deployment-1.2", localName, qname, atts);
}
@Override
public void endElement(String uri, String localName, String qName) throws SAXException {
- super.endElement("http://karaf.apache.org/xmlns/features/v1.0.0", localName, qName);
+ super.endElement("http://geronimo.apache.org/xml/ns/deployment-1.2", localName, qName);
}
}
Modified: geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/service/plan/ModuleType.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/service/plan/ModuleType.java?rev=1096951&r1=1096950&r2=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/service/plan/ModuleType.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/service/plan/ModuleType.java Tue Apr 26 23:18:49 2011
@@ -37,7 +37,7 @@ import javax.xml.bind.annotation.XmlType
*
*
*/
-@XmlRootElement
+@XmlRootElement(name = "module")
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "moduleType", propOrder = {
"environment",
Added: geronimo/server/trunk/framework/modules/geronimo-service-builder/src/test/java/org/apache/geronimo/deployment/service/JaxbTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-service-builder/src/test/java/org/apache/geronimo/deployment/service/JaxbTest.java?rev=1096951&view=auto
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-service-builder/src/test/java/org/apache/geronimo/deployment/service/JaxbTest.java (added)
+++ geronimo/server/trunk/framework/modules/geronimo-service-builder/src/test/java/org/apache/geronimo/deployment/service/JaxbTest.java Tue Apr 26 23:18:49 2011
@@ -0,0 +1,173 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.apache.geronimo.deployment.service;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.StringWriter;
+
+import javax.xml.bind.JAXBException;
+import javax.xml.stream.XMLStreamException;
+import org.apache.geronimo.deployment.service.plan.JaxbUtil;
+import org.apache.geronimo.deployment.service.plan.ModuleType;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * @version $Rev:$ $Date:$
+ */
+public class JaxbTest {
+
+// private static String PLAN = "<module xmlns=\"http://geronimo.apache.org/xml/ns/deployment-1.2\">\n" +
+// "\n" +
+// " <environment>\n" +
+// " <moduleId>\n" +
+// " <groupId>geronimo</groupId>\n" +
+// " <artifactId>foo4</artifactId>\n" +
+// " <version>DEV</version>\n" +
+// " <type>car</type>\n" +
+// " </moduleId>\n" +
+// " </environment>\n" +
+// " <gbean name=\"MyMockGMBean\" class=\"org.apache.geronimo.deployment.MockGBean\">\n" +
+// " <attribute name=\"value\">1234</attribute>\n" +
+// " <attribute name=\"intValue\">1234</attribute>\n" +
+// " <reference name=\"MockEndpoint\">\n" +
+// " <name>MyMockGMBean</name>\n" +
+// " </reference>\n" +
+// " </gbean>\n" +
+// "</module>";
+
+ private static String PLAN = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n" +
+ "<module xmlns:ns2=\"http://geronimo.apache.org/xml/ns/deployment/javabean-1.0\" xmlns=\"http://geronimo.apache.org/xml/ns/deployment-1.2\">\n" +
+ " <environment>\n" +
+ " <moduleId>\n" +
+ " <groupId>org.apache.geronimo.framework.config</groupId>\n" +
+ " <artifactId>j2ee-system</artifactId>\n" +
+ " <version>3.0-SNAPSHOT</version>\n" +
+ " <type>car</type>\n" +
+ " </moduleId>\n" +
+ " </environment>\n" +
+ " <gbean name=\"ServerInfo\" class=\"org.apache.geronimo.system.serverinfo.BasicServerInfo\">\n" +
+ " <attribute name=\"useSystemProperties\">true</attribute>\n" +
+ " </gbean>\n" +
+ " <gbean name=\"Repository\" class=\"org.apache.geronimo.system.repository.Maven2Repository\">\n" +
+ " <attribute name=\"root\">repository/</attribute>\n" +
+ " <reference name=\"ServerInfo\">\n" +
+ " <name>ServerInfo</name>\n" +
+ " </reference>\n" +
+ " </gbean>\n" +
+ " <gbean name=\"ServerStatus\" class=\"org.apache.geronimo.system.main.ServerStatusGBean\">\n" +
+ " <attribute name=\"serverStarted\">false</attribute>\n" +
+ " </gbean>\n" +
+ " <gbean name=\"Local\" class=\"org.apache.geronimo.system.configuration.RepositoryConfigurationStore\">\n" +
+ " <reference name=\"Repository\">\n" +
+ " <name>Repository</name>\n" +
+ " </reference>\n" +
+ " </gbean>\n" +
+ " <gbean name=\"AttributeManager\" class=\"org.apache.geronimo.system.configuration.LocalAttributeManager\">\n" +
+ " <attribute name=\"configFile\">var/config/config.xml</attribute>\n" +
+ " <attribute name=\"substitutionsFile\">var/config/config-substitutions.properties</attribute>\n" +
+ " <attribute name=\"substitutionPrefix\">org.apache.geronimo.config.substitution.</attribute>\n" +
+ " <reference name=\"ServerInfo\">\n" +
+ " <name>ServerInfo</name>\n" +
+ " </reference>\n" +
+ " </gbean>\n" +
+ " <gbean name=\"ArtifactManager\" class=\"org.apache.geronimo.kernel.repository.DefaultArtifactManager\"/>\n" +
+ " <gbean name=\"ArtifactResolver\" class=\"org.apache.geronimo.system.resolver.ExplicitDefaultArtifactResolver\">\n" +
+ " <attribute name=\"versionMapLocation\">var/config/artifact_aliases.properties</attribute>\n" +
+ " <reference name=\"ArtifactManager\">\n" +
+ " <name>ArtifactManager</name>\n" +
+ " </reference>\n" +
+ " <reference name=\"Repositories\"/>\n" +
+ " <reference name=\"ServerInfo\">\n" +
+ " <name>ServerInfo</name>\n" +
+ " </reference>\n" +
+ " <reference name=\"ConfigurationManagers\">\n" +
+ " <name>ConfigurationManager</name>\n" +
+ " </reference>\n" +
+ " </gbean>\n" +
+ " <gbean name=\"ConfigurationManager\" class=\"org.apache.geronimo.kernel.config.EditableKernelConfigurationManager\">\n" +
+ " <attribute name=\"defaultStoreNameQuery\">?name=Local</attribute>\n" +
+ " <reference name=\"Repositories\"/>\n" +
+ " <reference name=\"Stores\"/>\n" +
+ " <reference name=\"Watchers\"/>\n" +
+ " <reference name=\"AttributeStore\">\n" +
+ " <name>AttributeManager</name>\n" +
+ " </reference>\n" +
+ " <reference name=\"PersistentConfigurationList\">\n" +
+ " <type>AttributeStore</type>\n" +
+ " <name>AttributeManager</name>\n" +
+ " </reference>\n" +
+ " <reference name=\"ArtifactManager\">\n" +
+ " <name>ArtifactManager</name>\n" +
+ " </reference>\n" +
+ " <reference name=\"ArtifactResolver\">\n" +
+ " <name>ArtifactResolver</name>\n" +
+ " </reference>\n" +
+ " </gbean>\n" +
+ " <gbean name=\"Logger\" class=\"org.apache.geronimo.system.logging.OSGILogServiceWrapper\"/>\n" +
+ " <gbean name=\"GeronimoOBR\" class=\"org.apache.geronimo.obr.GeronimoOBRGBean\">\n" +
+ " <attribute name=\"exclusions\">\n" +
+ " org.apache.felix/org.apache.felix.framework//,\n" +
+ " org.eclipse/osgi//\n" +
+ " </attribute>\n" +
+ " <reference name=\"Repository\">\n" +
+ " <name>Repository</name>\n" +
+ " </reference>\n" +
+ " <reference name=\"ServerInfo\">\n" +
+ " <name>ServerInfo</name>\n" +
+ " </reference>\n" +
+ " </gbean>\n" +
+ " <gbean name=\"EmbeddedDaemon\" class=\"org.apache.geronimo.system.main.EmbeddedDaemon\"/>\n" +
+ "</module>";
+
+ @Test
+ public void testMarshalling() throws Exception {
+// InputStream in = getClass().getClassLoader().getResourceAsStream("service/plan1.xml");
+ InputStream in = new ByteArrayInputStream(PLAN.getBytes());
+ ModuleType moduleType;
+ moduleType = checkUnmarshall(in);
+ StringWriter out = new StringWriter();
+ JaxbUtil.marshalModule(moduleType, out);
+ in = new ByteArrayInputStream(out.toString().getBytes());
+ checkUnmarshall(in);
+ }
+
+ private ModuleType checkUnmarshall(InputStream in) throws XMLStreamException, JAXBException, IOException {
+ ModuleType moduleType;
+ try {
+ moduleType = JaxbUtil.unmarshalModule(in, false);
+ assertTrue(moduleType.getEnvironment() != null);
+ assertTrue(moduleType.getEnvironment().getModuleId() != null);
+// assertEquals("foo4", moduleType.getEnvironment().getModuleId().getArtifactId());
+ assertEquals("j2ee-system", moduleType.getEnvironment().getModuleId().getArtifactId());
+
+ assertEquals(11, moduleType.getGbean().size());
+
+ } finally {
+ in.close();
+ }
+ return moduleType;
+ }
+}
Propchange: geronimo/server/trunk/framework/modules/geronimo-service-builder/src/test/java/org/apache/geronimo/deployment/service/JaxbTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/framework/modules/geronimo-service-builder/src/test/java/org/apache/geronimo/deployment/service/JaxbTest.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/framework/modules/geronimo-service-builder/src/test/java/org/apache/geronimo/deployment/service/JaxbTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: geronimo/server/trunk/framework/modules/geronimo-service-builder/src/test/resources/services/plan1.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-service-builder/src/test/resources/services/plan1.xml?rev=1096951&r1=1096950&r2=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-service-builder/src/test/resources/services/plan1.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-service-builder/src/test/resources/services/plan1.xml Tue Apr 26 23:18:49 2011
@@ -27,49 +27,10 @@
<version>DEV</version>
<type>car</type>
</moduleId>
- <dependencies>
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>foo3</artifactId>
- <version>DEV</version>
- <type>car</type>
- </dependency>
-
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>foo1</artifactId>
- <version>DEV</version>
- </dependency>
-
- <dependency>
- <groupId>
- geronimo
- </groupId>
- <artifactId>
- foo2
- </artifactId>
- <version>
- DEV
- </version>
- </dependency>
-
- </dependencies>
</environment>
<gbean name="MyMockGMBean" class="org.apache.geronimo.deployment.MockGBean">
<attribute name="value">1234</attribute>
<attribute name="intValue">1234</attribute>
- <xml-attribute name="fooBarBean">
- <ns:javabean xmlns:ns="http://geronimo.apache.org/xml/ns/deployment/javabean-1.0">
- <ns:property name="Foo">foo</ns:property>
- <ns:property name="Bar">10</ns:property>
- <ns:bean-property name="Bean">
- <ns:javabean>
- <ns:property name="Foo">foo2</ns:property>
- <ns:property name="Bar">100</ns:property>
- </ns:javabean>
- </ns:bean-property>
- </ns:javabean>
- </xml-attribute>
<reference name="MockEndpoint">
<name>MyMockGMBean</name>
</reference>
Modified: geronimo/server/trunk/framework/modules/geronimo-shell-base/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-shell-base/pom.xml?rev=1096951&r1=1096950&r2=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-shell-base/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-shell-base/pom.xml Tue Apr 26 23:18:49 2011
@@ -58,8 +58,8 @@
<dependency>
<groupId>org.apache.karaf.shell</groupId>
<artifactId>org.apache.karaf.shell.console</artifactId>
- </dependency>
-
+ </dependency>
+
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint</artifactId>
Modified: geronimo/server/trunk/framework/modules/geronimo-shell-diagnose/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-shell-diagnose/pom.xml?rev=1096951&r1=1096950&r2=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-shell-diagnose/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-shell-diagnose/pom.xml Tue Apr 26 23:18:49 2011
@@ -37,18 +37,6 @@
</dependency>
<dependency>
- <groupId>org.apache.aries.proxy</groupId>
- <artifactId>org.apache.aries.proxy</artifactId>
- <version>${aries.proxy.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.aries.testsupport</groupId>
- <artifactId>org.apache.aries.testsupport.unit</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint</artifactId>
</dependency>
@@ -67,7 +55,7 @@
<configuration>
<instructions>
<Import-Package>
- org.apache.felix.service.command;version="0.4.0",
+ org.osgi.service.command;version="0.4.0",
org.eclipse.*;resolution:=optional,
*
</Import-Package>
Modified: geronimo/server/trunk/framework/modules/geronimo-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/pom.xml?rev=1096951&r1=1096950&r2=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/pom.xml Tue Apr 26 23:18:49 2011
@@ -74,6 +74,7 @@
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-pax-logging</artifactId>
<version>${project.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
@@ -103,30 +104,30 @@
<artifactId>org.apache.felix.scr</artifactId>
</dependency>
<!-- plugin management -->
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaxb_2.2_spec</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-stax-api_1.2_spec</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.bundles</groupId>
- <artifactId>jaxb-impl</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-activation_1.1_spec</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.bundles</groupId>
- <artifactId>woodstox</artifactId>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>org.apache.geronimo.specs</groupId>-->
+ <!--<artifactId>geronimo-jaxb_2.2_spec</artifactId>-->
+ <!--</dependency>-->
+
+ <!--<dependency>-->
+ <!--<groupId>org.apache.geronimo.specs</groupId>-->
+ <!--<artifactId>geronimo-stax-api_1.2_spec</artifactId>-->
+ <!--</dependency>-->
+
+ <!--<dependency>-->
+ <!--<groupId>org.apache.geronimo.bundles</groupId>-->
+ <!--<artifactId>jaxb-impl</artifactId>-->
+ <!--</dependency>-->
+
+ <!--<dependency>-->
+ <!--<groupId>org.apache.geronimo.specs</groupId>-->
+ <!--<artifactId>geronimo-activation_1.1_spec</artifactId>-->
+ <!--</dependency>-->
+
+ <!--<dependency>-->
+ <!--<groupId>org.apache.geronimo.bundles</groupId>-->
+ <!--<artifactId>woodstox</artifactId>-->
+ <!--</dependency>-->
<dependency>
<groupId>org.apache.felix</groupId>
@@ -195,6 +196,7 @@
<!--<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>-->
<Import-Package>
org.apache.geronimo.cli.*;resolution:=optional,
+ org.apache.geronimo.logging.*;resolution:=optional,
net.sf.cglib.*;resolution:=optional,
org.apache.log4j.helpers;resolution:=optional,
*</Import-Package>
Modified: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/DependencyManager.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/DependencyManager.java?rev=1096951&r1=1096950&r2=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/DependencyManager.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/DependencyManager.java Tue Apr 26 23:18:49 2011
@@ -541,4 +541,3 @@ public class DependencyManager implement
}
}
}
-
Modified: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/RepositoryConfigurationStore.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/RepositoryConfigurationStore.java?rev=1096951&r1=1096950&r2=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/RepositoryConfigurationStore.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/RepositoryConfigurationStore.java Tue Apr 26 23:18:49 2011
@@ -22,42 +22,44 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.net.MalformedURLException;
+import java.net.URI;
import java.net.URL;
import java.util.ArrayList;
import java.util.Enumeration;
import java.util.Iterator;
import java.util.List;
+import java.util.Map;
import java.util.Set;
import java.util.SortedSet;
-import java.util.jar.JarEntry;
import java.util.jar.JarFile;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
import java.util.zip.ZipOutputStream;
import javax.management.ObjectName;
-
+import org.apache.felix.scr.annotations.Activate;
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Property;
+import org.apache.felix.scr.annotations.Reference;
+import org.apache.felix.scr.annotations.ReferenceCardinality;
+import org.apache.felix.scr.annotations.Service;
import org.apache.geronimo.gbean.AbstractName;
-import org.apache.geronimo.gbean.annotation.GBean;
-import org.apache.geronimo.gbean.annotation.ParamReference;
-import org.apache.geronimo.gbean.annotation.ParamSpecial;
-import org.apache.geronimo.gbean.annotation.SpecialAttributeType;
-import org.apache.geronimo.kernel.Kernel;
-import org.apache.geronimo.kernel.ObjectNameUtil;
+import org.apache.geronimo.kernel.Jsr77Naming;
+import org.apache.geronimo.kernel.Naming;
import org.apache.geronimo.kernel.config.ConfigurationAlreadyExistsException;
import org.apache.geronimo.kernel.config.ConfigurationData;
-import org.apache.geronimo.kernel.config.ConfigurationDataTransformer;
import org.apache.geronimo.kernel.config.ConfigurationInfo;
import org.apache.geronimo.kernel.config.ConfigurationStore;
import org.apache.geronimo.kernel.config.ConfigurationUtil;
import org.apache.geronimo.kernel.config.InvalidConfigException;
-import org.apache.geronimo.kernel.config.NoOConfigurationDataTransformer;
import org.apache.geronimo.kernel.config.NoSuchConfigException;
import org.apache.geronimo.kernel.repository.Artifact;
+import org.apache.geronimo.kernel.repository.Maven2Repository;
import org.apache.geronimo.kernel.repository.WritableListableRepository;
import org.apache.geronimo.kernel.util.FileUtils;
import org.apache.geronimo.kernel.util.IOUtils;
import org.apache.geronimo.kernel.util.JarUtils;
+import org.apache.geronimo.system.serverinfo.ServerInfo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -67,43 +69,51 @@ import org.slf4j.LoggerFactory;
*
* @version $Rev$ $Date$
*/
-@GBean(j2eeType= "ConfigurationStore")
+@Component(metatype=true)
+@Service
public class RepositoryConfigurationStore implements ConfigurationStore {
private static final Logger log = LoggerFactory.getLogger(RepositoryConfigurationStore.class);
- private final Kernel kernel;
- private final ObjectName objectName;
- private final AbstractName abstractName;
- protected final WritableListableRepository repository;
- private final InPlaceConfigurationUtil inPlaceConfUtil;
- private final ConfigurationDataTransformer transformer;
+
+ @Property(value = "local-repo")
+ private final static String REPOSITORY_ROOT = "repository.root";
+
+ @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
+ private ServerInfo serverInfo;
+
+ private final Naming naming = new Jsr77Naming();
+ private final AbstractName abstractName = new AbstractName(URI.create("geronimo/base/0.0/car?name=ConfigurationStore"));
+ private final ObjectName objectName = abstractName.getObjectName();
+ protected WritableListableRepository repository;
+ private final InPlaceConfigurationUtil inPlaceConfUtil = new InPlaceConfigurationUtil();
public RepositoryConfigurationStore(WritableListableRepository repository) {
- this(null, null, null, repository, NoOConfigurationDataTransformer.SINGLETON);
+// this.objectName = objectName == null ? null : ObjectNameUtil.getObjectName(objectName);
+// this.abstractName = abstractName;
+ this.repository = repository;
+
+// inPlaceConfUtil = new InPlaceConfigurationUtil();
}
- public RepositoryConfigurationStore(Kernel kernel,
- String objectName,
- AbstractName abstractName,
- WritableListableRepository repository) {
- this(kernel, objectName, abstractName, repository, NoOConfigurationDataTransformer.SINGLETON);
- }
-
- public RepositoryConfigurationStore(@ParamSpecial(type=SpecialAttributeType.kernel) Kernel kernel,
- @ParamSpecial(type=SpecialAttributeType.objectName) String objectName,
- @ParamSpecial(type=SpecialAttributeType.abstractName) AbstractName abstractName,
- @ParamReference(name=GBEAN_REF_REPOSITORY, namingType=GBEAN_REF_REPOSITORY) WritableListableRepository repository,
- @ParamReference(name=GBEAN_REF_CONFIG_DATA_TRANSFORMER) ConfigurationDataTransformer transformer) {
- this.kernel = kernel;
- this.objectName = objectName == null ? null : ObjectNameUtil.getObjectName(objectName);
- this.abstractName = abstractName;
- this.repository = repository;
- if (null == transformer) {
- this.transformer = NoOConfigurationDataTransformer.SINGLETON;
- } else {
- this.transformer = transformer;
+
+ public RepositoryConfigurationStore() {
+ log.info("created");
+ }
+
+ public void setServerInfo(ServerInfo serverInfo) {
+ this.serverInfo = serverInfo;
+ }
+
+ public void unsetServerInfo(ServerInfo serverInfo) {
+ if (serverInfo == this.serverInfo) {
+ this.serverInfo = null;
}
+ }
- inPlaceConfUtil = new InPlaceConfigurationUtil();
+ @Activate
+ public void activate(Map<String, String> properties) {
+ String repoRoot = properties.get(REPOSITORY_ROOT);
+ File rootFile = serverInfo.resolve(repoRoot);
+ repository = new Maven2Repository(rootFile);
}
public String getObjectName() {
@@ -162,11 +172,7 @@ public class RepositoryConfigurationStor
configurationData.setConfigurationDir(location);
configurationData.setConfigurationStore(this);
- if (kernel != null) {
- configurationData.setNaming(kernel.getNaming());
- }
-
- transformer.transformDependencies(configurationData);
+ configurationData.setNaming(naming);
return configurationData;
}
@@ -442,7 +448,6 @@ public class RepositoryConfigurationStor
}
}
- transformer.remove(configId);
}
public List<ConfigurationInfo> listConfigurations() {
Modified: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/PluginXmlUtil.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/PluginXmlUtil.java?rev=1096951&r1=1096950&r2=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/PluginXmlUtil.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/PluginXmlUtil.java Tue Apr 26 23:18:49 2011
@@ -76,11 +76,15 @@ public class PluginXmlUtil {
}
}
- public static void writePluginMetadata(PluginType metadata, OutputStream out) throws XMLStreamException, JAXBException {
- Marshaller marshaller = PLUGIN_CONTEXT.createMarshaller();
- marshaller.setProperty("jaxb.formatted.output", true);
- JAXBElement<PluginType> element = new ObjectFactory().createGeronimoPlugin(metadata);
- marshaller.marshal(element, out);
+ public static void writePluginMetadata(PluginType metadata, OutputStream out) throws IOException {
+ try {
+ Marshaller marshaller = PLUGIN_CONTEXT.createMarshaller();
+ marshaller.setProperty("jaxb.formatted.output", true);
+ JAXBElement<PluginType> element = new ObjectFactory().createGeronimoPlugin(metadata);
+ marshaller.marshal(element, out);
+ } catch (JAXBException e) {
+ throw new IOException("Could not marshal plugin type", e);
+ }
}
public static void writePluginArtifact(PluginArtifactType value, Writer out) throws XMLStreamException, JAXBException {
Modified: geronimo/server/trunk/framework/modules/testsupport-common/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/testsupport-common/pom.xml?rev=1096951&r1=1096950&r2=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/testsupport-common/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/testsupport-common/pom.xml Tue Apr 26 23:18:49 2011
@@ -50,10 +50,10 @@
<artifactId>org.apache.servicemix.bundles.xmlbeans</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-stax-api_1.2_spec</artifactId>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>org.apache.geronimo.specs</groupId>-->
+ <!--<artifactId>geronimo-stax-api_1.2_spec</artifactId>-->
+ <!--</dependency>-->
<dependency>
<groupId>org.ops4j.pax.logging</groupId>
<artifactId>pax-logging-api</artifactId>
Modified: geronimo/server/trunk/framework/plugingroups/framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/plugingroups/framework/pom.xml?rev=1096951&r1=1096950&r2=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/plugingroups/framework/pom.xml (original)
+++ geronimo/server/trunk/framework/plugingroups/framework/pom.xml Tue Apr 26 23:18:49 2011
@@ -50,79 +50,79 @@
</dependency>
<dependency>
- <groupId>org.apache.geronimo.framework</groupId>
+ <groupId>org.apache.geronimo.framework.config</groupId>
<artifactId>j2ee-system</artifactId>
<version>${project.version}</version>
<type>car</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.framework</groupId>
+ <groupId>org.apache.geronimo.framework.config</groupId>
<artifactId>client-system</artifactId>
<version>${project.version}</version>
<type>car</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.framework</groupId>
+ <groupId>org.apache.geronimo.framework.config</groupId>
<artifactId>rmi-naming</artifactId>
<version>${project.version}</version>
<type>car</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.framework</groupId>
+ <groupId>org.apache.geronimo.framework.config</groupId>
<artifactId>plugin</artifactId>
<version>${project.version}</version>
<type>car</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.framework</groupId>
+ <groupId>org.apache.geronimo.framework.config</groupId>
<artifactId>j2ee-security</artifactId>
<version>${project.version}</version>
<type>car</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.framework</groupId>
+ <groupId>org.apache.geronimo.framework.config</groupId>
<artifactId>server-security-config</artifactId>
<version>${project.version}</version>
<type>car</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.framework</groupId>
+ <groupId>org.apache.geronimo.framework.config</groupId>
<artifactId>shutdown</artifactId>
<version>${project.version}</version>
<type>car</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.framework</groupId>
+ <groupId>org.apache.geronimo.framework.config</groupId>
<artifactId>jsr88-cli</artifactId>
<version>${project.version}</version>
<type>car</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.framework</groupId>
+ <groupId>org.apache.geronimo.framework.config</groupId>
<artifactId>online-deployer</artifactId>
<version>${project.version}</version>
<type>car</type>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>car-maven-plugin</artifactId>
- <configuration>
- <category>Geronimo Plugin Group</category>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <!--<build>-->
+ <!--<plugins>-->
+ <!--<plugin>-->
+ <!--<groupId>org.apache.geronimo.buildsupport</groupId>-->
+ <!--<artifactId>car-maven-plugin</artifactId>-->
+ <!--<configuration>-->
+ <!--<category>Geronimo Plugin Group</category>-->
+ <!--</configuration>-->
+ <!--</plugin>-->
+ <!--</plugins>-->
+ <!--</build>-->
</project>
Modified: geronimo/server/trunk/framework/plugingroups/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/plugingroups/pom.xml?rev=1096951&r1=1096950&r2=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/plugingroups/pom.xml (original)
+++ geronimo/server/trunk/framework/plugingroups/pom.xml Tue Apr 26 23:18:49 2011
@@ -30,7 +30,7 @@
<packaging>pom</packaging>
<modules>
- <module>framework</module>
+ <!--<module>framework</module>-->
</modules>
<build>
Modified: geronimo/server/trunk/framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/pom.xml?rev=1096951&r1=1096950&r2=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/pom.xml (original)
+++ geronimo/server/trunk/framework/pom.xml Tue Apr 26 23:18:49 2011
@@ -32,14 +32,7 @@
<artifactId>framework</artifactId>
<name>Geronimo Framework</name>
<packaging>pom</packaging>
-
- <properties>
- <equinox.version>3.6.0.v20100517</equinox.version>
- <felix.configadmin.version>1.2.4</felix.configadmin.version>
- <felix.framework.version>3.0.2</felix.framework.version>
- <pax.url.version>1.1.2</pax.url.version>
- </properties>
-
+
<dependencyManagement>
<dependencies>
<dependency>
@@ -195,6 +188,7 @@
<module>modules</module>
<module>buildsupport</module>
<module>configs</module>
+ <module>features</module>
<module>plugingroups</module>
<module>assemblies</module>
</modules>
Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=1096951&r1=1096950&r2=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Tue Apr 26 23:18:49 2011
@@ -87,8 +87,8 @@
<monitoringConsoleVersion>${project.version}</monitoringConsoleVersion>
<pax.logging.version>1.6.1</pax.logging.version>
- <woodstoxVersion>3.2.9_1</woodstoxVersion>
- <sxcVersion>0.7.3_1</sxcVersion>
+ <woodstoxVersion>4.0.6_2-SNAPSHOT</woodstoxVersion>
+ <sxcVersion>0.7.3_2-SNAPSHOT</sxcVersion>
<yokoVersion>1.2-SNAPSHOT</yokoVersion>
<!-- Deployers -->
@@ -1923,6 +1923,10 @@
<version>${aries.blueprint.version}</version>
<exclusions>
<exclusion>
+ <groupId>org.apache.aries.testsupport</groupId>
+ <artifactId>org.apache.aries.testsupport.unit</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
Re: svn commit: r1096951 [6/6] - in /geronimo/server/trunk: ./ framework/ framework/assemblies/ framework/assemblies/geronimo-framework/ framework/buildsupport/car-maven-plugin/src/main/filtered-resources/resources/etc/ framework/buildsupport/car-maven-plu...
Posted by David Blevins <da...@gmail.com>.
Followed up with Infra and we're using the better part of 67GB of /tmp in buildbot (around 50GB).
Will add the fix back in tomorrow.
-David
On Aug 19, 2011, at 5:27 PM, David Jencks wrote:
> I'm not sure how this got removed, but this is in what turned into the 3.0-osgi branch, not current trunk. I guess I should investigate since I've been working with that code some more....
>
> david jencks
>
> On Aug 19, 2011, at 4:50 PM, David Blevins wrote:
>
>> David,
>>
>> Any info on why this was removed? Guessing it was just a side effect of a merge.
>>
>> (related jira https://issues.apache.org/jira/browse/GERONIMO-5888)
>>
>>
>> -David
>>
>> On Apr 26, 2011, at 4:19 PM, djencks@apache.org wrote:
>>
>>> Modified: geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/util/FileUtils.java
>>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/util/FileUtils.java?rev=1096951&r1=1096950&r2=1096951&view=diff
>>> ==============================================================================
>>> --- geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/util/FileUtils.java (original)
>>> +++ geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/util/FileUtils.java Tue Apr 26 23:18:49 2011
>>> @@ -30,7 +30,6 @@ import java.io.OutputStream;
>>> import java.io.OutputStreamWriter;
>>> import java.net.MalformedURLException;
>>> import java.net.URL;
>>> -import java.util.ArrayList;
>>> import java.util.Collection;
>>> import java.util.Collections;
>>> import java.util.Enumeration;
>>> @@ -38,7 +37,6 @@ import java.util.HashMap;
>>> import java.util.LinkedHashMap;
>>> import java.util.LinkedHashSet;
>>> import java.util.LinkedList;
>>> -import java.util.List;
>>> import java.util.Map;
>>> import java.util.Set;
>>> import java.util.jar.JarFile;
>>> @@ -83,7 +81,6 @@ public class FileUtils {
>>> File tempDir = File.createTempFile("geronimo-fileutils", ".tmpdir");
>>> tempDir.delete();
>>> tempDir.mkdirs();
>>> - deleteOnExit(tempDir);
>>> return tempDir;
>>> }
>>>
>>> @@ -412,37 +409,4 @@ public class FileUtils {
>>>
>>> private FileUtils() {
>>> }
>>> -
>>> - // Shutdown hook for recurssive delete on tmp directories
>>> - static final List<String> delete = new ArrayList<String>();
>>> -
>>> - static {
>>> - Runtime.getRuntime().addShutdownHook(new Thread(){
>>> - @Override
>>> - public void run() {
>>> - delete();
>>> - }
>>> - });
>>> - }
>>> -
>>> - private static void deleteOnExit(File file) {
>>> - delete.add(file.getAbsolutePath());
>>> - }
>>> -
>>> - private static void delete() {
>>> - for (String path : delete) {
>>> - delete(new File(path));
>>> - }
>>> - }
>>> -
>>> - private static void delete(File file) {
>>> - if (file.isDirectory()) {
>>> - for (File f : file.listFiles()) {
>>> - delete(f);
>>> - }
>>> - }
>>> -
>>> - file.delete();
>>> - }
>>> -
>>> }
>>>
>>
>
Re: svn commit: r1096951 [6/6] - in /geronimo/server/trunk: ./ framework/ framework/assemblies/ framework/assemblies/geronimo-framework/ framework/buildsupport/car-maven-plugin/src/main/filtered-resources/resources/etc/ framework/buildsupport/car-maven-plu...
Posted by David Jencks <da...@yahoo.com>.
I'm not sure how this got removed, but this is in what turned into the 3.0-osgi branch, not current trunk. I guess I should investigate since I've been working with that code some more....
david jencks
On Aug 19, 2011, at 4:50 PM, David Blevins wrote:
> David,
>
> Any info on why this was removed? Guessing it was just a side effect of a merge.
>
> (related jira https://issues.apache.org/jira/browse/GERONIMO-5888)
>
>
> -David
>
> On Apr 26, 2011, at 4:19 PM, djencks@apache.org wrote:
>
>> Modified: geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/util/FileUtils.java
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/util/FileUtils.java?rev=1096951&r1=1096950&r2=1096951&view=diff
>> ==============================================================================
>> --- geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/util/FileUtils.java (original)
>> +++ geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/util/FileUtils.java Tue Apr 26 23:18:49 2011
>> @@ -30,7 +30,6 @@ import java.io.OutputStream;
>> import java.io.OutputStreamWriter;
>> import java.net.MalformedURLException;
>> import java.net.URL;
>> -import java.util.ArrayList;
>> import java.util.Collection;
>> import java.util.Collections;
>> import java.util.Enumeration;
>> @@ -38,7 +37,6 @@ import java.util.HashMap;
>> import java.util.LinkedHashMap;
>> import java.util.LinkedHashSet;
>> import java.util.LinkedList;
>> -import java.util.List;
>> import java.util.Map;
>> import java.util.Set;
>> import java.util.jar.JarFile;
>> @@ -83,7 +81,6 @@ public class FileUtils {
>> File tempDir = File.createTempFile("geronimo-fileutils", ".tmpdir");
>> tempDir.delete();
>> tempDir.mkdirs();
>> - deleteOnExit(tempDir);
>> return tempDir;
>> }
>>
>> @@ -412,37 +409,4 @@ public class FileUtils {
>>
>> private FileUtils() {
>> }
>> -
>> - // Shutdown hook for recurssive delete on tmp directories
>> - static final List<String> delete = new ArrayList<String>();
>> -
>> - static {
>> - Runtime.getRuntime().addShutdownHook(new Thread(){
>> - @Override
>> - public void run() {
>> - delete();
>> - }
>> - });
>> - }
>> -
>> - private static void deleteOnExit(File file) {
>> - delete.add(file.getAbsolutePath());
>> - }
>> -
>> - private static void delete() {
>> - for (String path : delete) {
>> - delete(new File(path));
>> - }
>> - }
>> -
>> - private static void delete(File file) {
>> - if (file.isDirectory()) {
>> - for (File f : file.listFiles()) {
>> - delete(f);
>> - }
>> - }
>> -
>> - file.delete();
>> - }
>> -
>> }
>>
>
Re: svn commit: r1096951 [6/6] - in /geronimo/server/trunk: ./ framework/ framework/assemblies/ framework/assemblies/geronimo-framework/ framework/buildsupport/car-maven-plugin/src/main/filtered-resources/resources/etc/ framework/buildsupport/car-maven-plu...
Posted by David Blevins <da...@gmail.com>.
David,
Any info on why this was removed? Guessing it was just a side effect of a merge.
(related jira https://issues.apache.org/jira/browse/GERONIMO-5888)
-David
On Apr 26, 2011, at 4:19 PM, djencks@apache.org wrote:
> Modified: geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/util/FileUtils.java
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/util/FileUtils.java?rev=1096951&r1=1096950&r2=1096951&view=diff
> ==============================================================================
> --- geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/util/FileUtils.java (original)
> +++ geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/util/FileUtils.java Tue Apr 26 23:18:49 2011
> @@ -30,7 +30,6 @@ import java.io.OutputStream;
> import java.io.OutputStreamWriter;
> import java.net.MalformedURLException;
> import java.net.URL;
> -import java.util.ArrayList;
> import java.util.Collection;
> import java.util.Collections;
> import java.util.Enumeration;
> @@ -38,7 +37,6 @@ import java.util.HashMap;
> import java.util.LinkedHashMap;
> import java.util.LinkedHashSet;
> import java.util.LinkedList;
> -import java.util.List;
> import java.util.Map;
> import java.util.Set;
> import java.util.jar.JarFile;
> @@ -83,7 +81,6 @@ public class FileUtils {
> File tempDir = File.createTempFile("geronimo-fileutils", ".tmpdir");
> tempDir.delete();
> tempDir.mkdirs();
> - deleteOnExit(tempDir);
> return tempDir;
> }
>
> @@ -412,37 +409,4 @@ public class FileUtils {
>
> private FileUtils() {
> }
> -
> - // Shutdown hook for recurssive delete on tmp directories
> - static final List<String> delete = new ArrayList<String>();
> -
> - static {
> - Runtime.getRuntime().addShutdownHook(new Thread(){
> - @Override
> - public void run() {
> - delete();
> - }
> - });
> - }
> -
> - private static void deleteOnExit(File file) {
> - delete.add(file.getAbsolutePath());
> - }
> -
> - private static void delete() {
> - for (String path : delete) {
> - delete(new File(path));
> - }
> - }
> -
> - private static void delete(File file) {
> - if (file.isDirectory()) {
> - for (File f : file.listFiles()) {
> - delete(f);
> - }
> - }
> -
> - file.delete();
> - }
> -
> }
>