geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From genspr...@apache.org
Subject svn commit: r929867 - in /geronimo/sandbox/shawn/openwebbeans: ./ geronimo-openwebbeans-builder/ geronimo-openwebbeans-builder/src/ geronimo-openwebbeans-builder/src/main/ geronimo-openwebbeans-builder/src/main/java/ geronimo-openwebbeans-builder/src/m...
Date Thu, 01 Apr 2010 07:16:06 GMT
Author: genspring
Date: Thu Apr  1 07:16:04 2010
New Revision: 929867

URL: http://svn.apache.org/viewvc?rev=929867&view=rev
Log:
start OpenWebBeansGBean integration in sandbox.

Added:
    geronimo/sandbox/shawn/openwebbeans/
    geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans/
    geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans-builder/
    geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans-builder/pom.xml   (with props)
    geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans-builder/src/
    geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans-builder/src/main/
    geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans-builder/src/main/java/
    geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans-builder/src/main/java/org/
    geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans-builder/src/main/java/org/apache/
    geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans-builder/src/main/java/org/apache/geronimo/
    geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans-builder/src/main/java/org/apache/geronimo/openwebbeans/
    geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans-builder/src/main/java/org/apache/geronimo/openwebbeans/deployment/
    geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans-builder/src/main/java/org/apache/geronimo/openwebbeans/deployment/OpenWebBeansModuleBuilderExtension.java
  (with props)
    geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans-builder/src/test/
    geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans-builder/src/test/java/
    geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans-builder/src/test/java/org/
    geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans-builder/src/test/java/org/apache/
    geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans-builder/src/test/java/org/apache/geronimo/
    geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans-builder/src/test/java/org/apache/geronimo/openwebbeans/
    geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans-builder/src/test/java/org/apache/geronimo/openwebbeans/deployment/
    geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans-builder/src/test/java/org/apache/geronimo/openwebbeans/deployment/BasicTest.java
  (with props)
    geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans-builder/src/test/resources/
    geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans/pom.xml   (with props)
    geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans/src/
    geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans/src/main/
    geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans/src/main/java/
    geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans/src/main/java/org/
    geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/
    geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/
    geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/
    geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/OpenWebBeansGBean.java
  (with props)
    geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans/src/test/
    geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans/src/test/java/
    geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans/src/test/java/org/
    geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans/src/test/java/org/apache/
    geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans/src/test/java/org/apache/geronimo/
    geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans/src/test/java/org/apache/geronimo/openwebbeans/
    geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans/src/test/java/org/apache/geronimo/openwebbeans/BasicTest.java
  (with props)
    geronimo/sandbox/shawn/openwebbeans/openwebbeans/
    geronimo/sandbox/shawn/openwebbeans/openwebbeans-deployer/
    geronimo/sandbox/shawn/openwebbeans/openwebbeans-deployer/pom.xml   (with props)
    geronimo/sandbox/shawn/openwebbeans/openwebbeans-deployer/src/
    geronimo/sandbox/shawn/openwebbeans/openwebbeans-deployer/src/main/
    geronimo/sandbox/shawn/openwebbeans/openwebbeans-deployer/src/main/history/
    geronimo/sandbox/shawn/openwebbeans/openwebbeans-deployer/src/main/history/dependencies.xml
  (with props)
    geronimo/sandbox/shawn/openwebbeans/openwebbeans-deployer/src/main/plan/
    geronimo/sandbox/shawn/openwebbeans/openwebbeans-deployer/src/main/plan/plan.xml   (with
props)
    geronimo/sandbox/shawn/openwebbeans/openwebbeans/pom.xml   (with props)
    geronimo/sandbox/shawn/openwebbeans/openwebbeans/src/
    geronimo/sandbox/shawn/openwebbeans/openwebbeans/src/main/
    geronimo/sandbox/shawn/openwebbeans/openwebbeans/src/main/history/
    geronimo/sandbox/shawn/openwebbeans/openwebbeans/src/main/history/dependencies.xml   (with
props)
    geronimo/sandbox/shawn/openwebbeans/openwebbeans/src/main/plan/
    geronimo/sandbox/shawn/openwebbeans/openwebbeans/src/main/plan/plan.xml   (with props)
    geronimo/sandbox/shawn/openwebbeans/pom.xml   (with props)

Added: geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans-builder/pom.xml?rev=929867&view=auto
==============================================================================
--- geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans-builder/pom.xml (added)
+++ geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans-builder/pom.xml Thu Apr  1 07:16:04
2010
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+    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.
+-->
+
+<!-- $Rev: 805240 $ $Date: 2009-08-17 18:02:22 -0700 (Mon, 17 Aug 2009) $ -->
+
+<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">
+
+    <modelVersion>4.0.0</modelVersion>
+    
+    <parent>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>openwebbeans</artifactId>
+        <version>3.0-SNAPSHOT</version>
+    </parent>
+    
+    <groupId>org.apache.geronimo.modules</groupId>
+    <artifactId>geronimo-openwebbeans-builder</artifactId>
+    <packaging>bundle</packaging>
+    <name>Geronimo Plugins, OpenWebBeans :: Builder</name>
+    
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-j2ee-builder</artifactId>
+            <version>${version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-openwebbeans</artifactId>
+            <version>${version}</version>
+        </dependency>
+        
+    </dependencies>
+
+</project>

Propchange: geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans-builder/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans-builder/src/main/java/org/apache/geronimo/openwebbeans/deployment/OpenWebBeansModuleBuilderExtension.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans-builder/src/main/java/org/apache/geronimo/openwebbeans/deployment/OpenWebBeansModuleBuilderExtension.java?rev=929867&view=auto
==============================================================================
--- geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans-builder/src/main/java/org/apache/geronimo/openwebbeans/deployment/OpenWebBeansModuleBuilderExtension.java
(added)
+++ geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans-builder/src/main/java/org/apache/geronimo/openwebbeans/deployment/OpenWebBeansModuleBuilderExtension.java
Thu Apr  1 07:16:04 2010
@@ -0,0 +1,179 @@
+/**
+ * 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.openwebbeans.deployment;
+
+import org.apache.geronimo.common.DeploymentException;
+import org.apache.geronimo.deployment.ModuleIDBuilder;
+import org.apache.geronimo.deployment.service.EnvironmentBuilder;
+import org.apache.geronimo.gbean.AbstractName;
+import org.apache.geronimo.gbean.AbstractNameQuery;
+import org.apache.geronimo.gbean.GBeanData;
+import org.apache.geronimo.gbean.GBeanInfo;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
+import org.apache.geronimo.gbean.annotation.ParamAttribute;
+import org.apache.geronimo.gbean.annotation.ParamReference;
+import org.apache.geronimo.j2ee.annotation.Holder;
+import org.apache.geronimo.j2ee.deployment.EARContext;
+import org.apache.geronimo.j2ee.deployment.Module;
+import org.apache.geronimo.j2ee.deployment.ModuleBuilderExtension;
+import org.apache.geronimo.j2ee.deployment.NamingBuilder;
+import org.apache.geronimo.j2ee.deployment.WebModule;
+import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
+import org.apache.geronimo.kernel.Naming;
+import org.apache.geronimo.kernel.config.ConfigurationStore;
+import org.apache.geronimo.kernel.repository.Environment;
+import org.apache.geronimo.xbeans.javaee6.FullyQualifiedClassType;
+import org.apache.geronimo.xbeans.javaee6.ListenerType;
+import org.apache.geronimo.xbeans.javaee6.ServletType;
+import org.apache.geronimo.xbeans.javaee6.WebAppType;
+import org.apache.xbean.finder.ClassFinder;
+import org.apache.xmlbeans.XmlObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.jar.JarFile;
+
+/**
+ * @version $Rev $Date
+ */
+public class OpenWebBeansModuleBuilderExtension implements ModuleBuilderExtension {
+
+    private static final Logger log = LoggerFactory.getLogger(OpenWebBeansModuleBuilderExtension.class);
+
+    private final Environment defaultEnvironment;
+    private final NamingBuilder namingBuilders;
+
+    private static final String CONTEXT_LISTENER_NAME = "";
+
+    public OpenWebBeansModuleBuilderExtension(Environment defaultEnvironment, NamingBuilder
namingBuilders) {
+        this.defaultEnvironment = defaultEnvironment;
+        this.namingBuilders = namingBuilders;
+    }
+
+    public void createModule(Module module, Object plan, JarFile moduleFile, String targetPath,
URL specDDUrl, Environment environment, Object moduleContextInfo, AbstractName earName, Naming
naming, ModuleIDBuilder idBuilder) throws DeploymentException {
+        if (!(module instanceof WebModule)) {
+            //not a web module, nothing to do
+            return;
+        }
+
+        EnvironmentBuilder.mergeEnvironments(environment, defaultEnvironment);
+    }
+
+    public void installModule(JarFile earFile, EARContext earContext, Module module, Collection
configurationStores, ConfigurationStore targetConfigurationStore, Collection repository) throws
DeploymentException {
+    }
+
+    public void initContext(EARContext earContext, Module module, ClassLoader cl) throws
DeploymentException {
+    }
+
+    public void addGBeans(EARContext earContext, Module module, ClassLoader cl, Collection
repository) throws DeploymentException {
+        if (!(module instanceof WebModule)) {
+            //not a web module, nothing to do
+            return;
+        }
+        WebModule webModule = (WebModule) module;
+        WebAppType webApp = (WebAppType) webModule.getSpecDD();
+
+
+        EARContext moduleContext = module.getEarContext();
+        Map sharedContext = module.getSharedContext();
+
+        //add the ServletContextListener to the web app context
+        GBeanData webAppData = (GBeanData) sharedContext.get(WebModule.WEB_APP_DATA);
+
+        //jetty specific support
+        Object value = webAppData.getAttribute("listenerClassNames");
+        if (value instanceof Collection && !((Collection) value).contains(CONTEXT_LISTENER_NAME))
{
+            ((Collection<String>) value).add(CONTEXT_LISTENER_NAME);
+        } else {
+            //try to add listener to the web app xml
+            ListenerType listenerType = webApp.addNewListener();
+            FullyQualifiedClassType className = listenerType.addNewListenerClass();
+            className.setStringValue(CONTEXT_LISTENER_NAME);
+        }
+
+        AbstractName moduleName = moduleContext.getModuleName();
+        Map<NamingBuilder.Key, Object> buildingContext = new HashMap<NamingBuilder.Key,
Object>();
+        buildingContext.put(NamingBuilder.GBEAN_NAME_KEY, moduleName);
+
+        //use the same jndi context as the web app
+        Map compContext = NamingBuilder.JNDI_KEY.get(module.getSharedContext());
+        buildingContext.put(NamingBuilder.JNDI_KEY, compContext);
+
+        //use the same holder object as the web app.
+        Holder holder = NamingBuilder.INJECTION_KEY.get(sharedContext);
+        buildingContext.put(NamingBuilder.INJECTION_KEY, holder);
+
+        XmlObject jettyWebApp = webModule.getVendorDD();
+
+        ClassFinder classFinder = createOpenWebBeansClassFinder(webApp, webModule);
+        webModule.setClassFinder(classFinder);
+
+        namingBuilders.buildNaming(webApp, jettyWebApp, webModule, buildingContext);
+
+    }
+
+    protected ClassFinder createOpenWebBeansClassFinder(WebAppType webApp, WebModule webModule)
throws DeploymentException {
+
+        List<Class> classes = getManagedClasses(webApp, webModule);
+        return new ClassFinder(classes);
+    }
+
+
+    private List<Class> getManagedClasses(WebAppType webApp, WebModule webModule) throws
DeploymentException {
+        log.debug("getManagedClasses( " + webApp.toString() + "," + '\n' +
+                (webModule != null ? webModule.getName() : null) + " ): Entry");
+
+        // Get the classloader from the module's EARContext
+        ClassLoader classLoader = webModule.getEarContext().getClassLoader();
+
+        List<Class> classes = new ArrayList<Class>();
+
+        // Look for all META-INF/beans.xml files and process those urls
+
+        // Add the managed bean classes
+
+        log.debug("getManagedClasses() Exit: " + classes.size() + " " + classes.toString());
+
+        // return the managed bean classes
+        return classes;
+    }
+
+    public static final GBeanInfo GBEAN_INFO;
+
+    static {
+        GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(OpenWebBeansModuleBuilderExtension.class,
NameFactory.MODULE_BUILDER);
+        infoBuilder.addAttribute("defaultEnvironment", Environment.class, true, true);
+        infoBuilder.addReference("NamingBuilders", NamingBuilder.class, NameFactory.MODULE_BUILDER);
+
+        infoBuilder.setConstructor(new String[]{
+                "defaultEnvironment",
+                "NamingBuilders"});
+        GBEAN_INFO = infoBuilder.getBeanInfo();
+    }
+
+    public static GBeanInfo getGBeanInfo() {
+        return GBEAN_INFO;
+    }
+
+}

Propchange: geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans-builder/src/main/java/org/apache/geronimo/openwebbeans/deployment/OpenWebBeansModuleBuilderExtension.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans-builder/src/test/java/org/apache/geronimo/openwebbeans/deployment/BasicTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans-builder/src/test/java/org/apache/geronimo/openwebbeans/deployment/BasicTest.java?rev=929867&view=auto
==============================================================================
--- geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans-builder/src/test/java/org/apache/geronimo/openwebbeans/deployment/BasicTest.java
(added)
+++ geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans-builder/src/test/java/org/apache/geronimo/openwebbeans/deployment/BasicTest.java
Thu Apr  1 07:16:04 2010
@@ -0,0 +1,37 @@
+/*
+ * 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.openwebbeans.deployment;
+
+import java.util.Collections;
+
+import junit.framework.TestCase;
+import org.apache.geronimo.gbean.GBeanInfo;
+import org.apache.geronimo.j2ee.deployment.NamingBuilderCollection;
+
+/**
+ * @version $Rev: 741679 $ $Date: 2009-02-06 11:07:17 -0800 (Fri, 06 Feb 2009) $
+ */
+public class BasicTest extends TestCase {
+    
+    public void test() throws Exception {
+    }
+
+}

Propchange: geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans-builder/src/test/java/org/apache/geronimo/openwebbeans/deployment/BasicTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans/pom.xml?rev=929867&view=auto
==============================================================================
--- geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans/pom.xml (added)
+++ geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans/pom.xml Thu Apr  1 07:16:04
2010
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+    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.
+-->
+
+<!-- $Rev: 805240 $ $Date: 2009-08-17 18:02:22 -0700 (Mon, 17 Aug 2009) $ -->
+
+<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">
+
+    <modelVersion>4.0.0</modelVersion>
+    
+    <parent>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>openwebbeans</artifactId>
+        <version>3.0-SNAPSHOT</version>
+    </parent>
+    
+    <groupId>org.apache.geronimo.modules</groupId>
+    <artifactId>geronimo-openwebbeans</artifactId>
+    <packaging>bundle</packaging>
+    <name>Geronimo Plugins, OpenWebBeans :: Core</name>
+    
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-j2ee</artifactId>
+            <version>${version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-naming</artifactId>
+            <version>${version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.openwebbeans</groupId>
+            <artifactId>openwebbeans-impl</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>

Propchange: geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/OpenWebBeansGBean.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/OpenWebBeansGBean.java?rev=929867&view=auto
==============================================================================
--- geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/OpenWebBeansGBean.java
(added)
+++ geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/OpenWebBeansGBean.java
Thu Apr  1 07:16:04 2010
@@ -0,0 +1,51 @@
+/*
+ * 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.openwebbeans;
+
+import org.apache.geronimo.gbean.GBeanLifecycle;
+import org.apache.geronimo.gbean.annotation.GBean;
+
+
+/**
+ * For help on using gbean annotations see:
+ * http://cwiki.apache.org/GMOxDOC22/gbean-annotations.html
+ *  
+ * @version $Rev: 698441 $ $Date: 2008-09-24 00:10:08 -0700 (Wed, 24 Sep 2008) $
+ */
+@GBean
+public class OpenWebBeansGBean implements GBeanLifecycle {
+    
+
+    public OpenWebBeansGBean() {
+    }
+
+
+    public void doStart() {
+    }
+
+    public void doStop() {
+    }
+
+    public void doFail() {
+        doStop();
+    }
+
+}

Propchange: geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/OpenWebBeansGBean.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans/src/test/java/org/apache/geronimo/openwebbeans/BasicTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans/src/test/java/org/apache/geronimo/openwebbeans/BasicTest.java?rev=929867&view=auto
==============================================================================
--- geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans/src/test/java/org/apache/geronimo/openwebbeans/BasicTest.java
(added)
+++ geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans/src/test/java/org/apache/geronimo/openwebbeans/BasicTest.java
Thu Apr  1 07:16:04 2010
@@ -0,0 +1,33 @@
+/*
+ * 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.openwebbeans;
+
+import junit.framework.TestCase;
+
+/**
+ * @version $Rev: 720842 $ $Date: 2008-11-26 05:18:49 -0800 (Wed, 26 Nov 2008) $
+ */
+public class BasicTest extends TestCase {
+
+    public void test() throws Exception {
+    }
+
+}

Propchange: geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans/src/test/java/org/apache/geronimo/openwebbeans/BasicTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/sandbox/shawn/openwebbeans/openwebbeans-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/shawn/openwebbeans/openwebbeans-deployer/pom.xml?rev=929867&view=auto
==============================================================================
--- geronimo/sandbox/shawn/openwebbeans/openwebbeans-deployer/pom.xml (added)
+++ geronimo/sandbox/shawn/openwebbeans/openwebbeans-deployer/pom.xml Thu Apr  1 07:16:04
2010
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+    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.
+-->
+
+<!-- $Rev: 805240 $ $Date: 2009-08-17 18:02:22 -0700 (Mon, 17 Aug 2009) $ -->
+
+<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">
+
+    <modelVersion>4.0.0</modelVersion>
+    
+    <parent>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>openwebbeans</artifactId>
+        <version>3.0-SNAPSHOT</version>
+    </parent>
+    
+    <groupId>org.apache.geronimo.configs</groupId>
+    <artifactId>openwebbeans-deployer</artifactId>
+    <name>Geronimo Plugins, OpenWebBeans :: Deployer</name>
+    <packaging>car</packaging>
+    
+    <dependencies>
+        <!-- parent -->
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>j2ee-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>openwebbeans</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-openwebbeans-builder</artifactId>
+            <version>${version}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <configuration>
+                    <category>Web Framework</category>
+                    <dependencies>
+                        <dependency>
+                            <groupId>org.apache.geronimo.configs</groupId>
+                            <artifactId>openwebbeans</artifactId>
+                            <type>car</type>
+                            <import>classes</import>
+                        </dependency>
+                    </dependencies>
+                    <instance>
+                        <plugin-artifact>
+                            <config-xml-content server="default" />
+                            <config-xml-content server="offline" />
+                        </plugin-artifact>
+                    </instance>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

Propchange: geronimo/sandbox/shawn/openwebbeans/openwebbeans-deployer/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/sandbox/shawn/openwebbeans/openwebbeans-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/shawn/openwebbeans/openwebbeans-deployer/src/main/history/dependencies.xml?rev=929867&view=auto
==============================================================================
--- geronimo/sandbox/shawn/openwebbeans/openwebbeans-deployer/src/main/history/dependencies.xml
(added)
+++ geronimo/sandbox/shawn/openwebbeans/openwebbeans-deployer/src/main/history/dependencies.xml
Thu Apr  1 07:16:04 2010
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<plugin-artifact xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
+    <module-id>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>openwebbeans-deployer</artifactId>
+        <version>3.0-SNAPSHOT</version>
+        <type>car</type>
+    </module-id>
+    <dependency>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>j2ee-deployer</artifactId>
+        <type>car</type>
+    </dependency>
+    <dependency start="true">
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>openwebbeans</artifactId>
+        <type>car</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-openwebbeans-builder</artifactId>
+        <type>jar</type>
+    </dependency>
+</plugin-artifact>

Propchange: geronimo/sandbox/shawn/openwebbeans/openwebbeans-deployer/src/main/history/dependencies.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/sandbox/shawn/openwebbeans/openwebbeans-deployer/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/shawn/openwebbeans/openwebbeans-deployer/src/main/plan/plan.xml?rev=929867&view=auto
==============================================================================
--- geronimo/sandbox/shawn/openwebbeans/openwebbeans-deployer/src/main/plan/plan.xml (added)
+++ geronimo/sandbox/shawn/openwebbeans/openwebbeans-deployer/src/main/plan/plan.xml Thu Apr
 1 07:16:04 2010
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    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.
+-->
+
+<!-- $Rev: 589946 $ $Date: 2007-10-29 19:53:25 -0700 (Mon, 29 Oct 2007) $ -->
+
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+
+    <gbean name="OpenWebBeansModuleBuilderExtension" class="org.apache.geronimo.openwebbeans.deployment.OpenWebBeansModuleBuilderExtension">
+        <reference name="NamingBuilders">
+            <name>NamingBuilders</name>
+        </reference>
+        <xml-attribute name="defaultEnvironment">
+            <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.geronimo.configs</groupId>
+                        <artifactId>openwebbeans</artifactId>
+                        <type>car</type>
+                    </dependency>
+                </dependencies>
+            </environment>
+        </xml-attribute>
+    </gbean>
+
+</module>

Propchange: geronimo/sandbox/shawn/openwebbeans/openwebbeans-deployer/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/sandbox/shawn/openwebbeans/openwebbeans/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/shawn/openwebbeans/openwebbeans/pom.xml?rev=929867&view=auto
==============================================================================
--- geronimo/sandbox/shawn/openwebbeans/openwebbeans/pom.xml (added)
+++ geronimo/sandbox/shawn/openwebbeans/openwebbeans/pom.xml Thu Apr  1 07:16:04 2010
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+    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.
+-->
+
+<!-- $Rev: 805240 $ $Date: 2009-08-17 18:02:22 -0700 (Mon, 17 Aug 2009) $ -->
+
+<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">
+
+    <modelVersion>4.0.0</modelVersion>
+    
+    <parent>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>openwebbeans</artifactId>
+        <version>3.0-SNAPSHOT</version>
+    </parent>
+    
+    <groupId>org.apache.geronimo.configs</groupId>
+    <artifactId>openwebbeans</artifactId>
+    <name>Geronimo Plugins, OpenWebBeans :: OpenWebBeans</name>
+    <packaging>car</packaging>
+
+    <description>Geronimo OpenWebBeans 299 integration</description>
+    
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-gbean-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+        
+        <!-- parent -->
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>j2ee-server</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-openwebbeans</artifactId>
+            <version>${version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.openwebbeans</groupId>
+            <artifactId>openwebbeans-impl</artifactId>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <configuration>
+                    <category>Web Framework</category>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    
+</project>

Propchange: geronimo/sandbox/shawn/openwebbeans/openwebbeans/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/sandbox/shawn/openwebbeans/openwebbeans/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/shawn/openwebbeans/openwebbeans/src/main/history/dependencies.xml?rev=929867&view=auto
==============================================================================
--- geronimo/sandbox/shawn/openwebbeans/openwebbeans/src/main/history/dependencies.xml (added)
+++ geronimo/sandbox/shawn/openwebbeans/openwebbeans/src/main/history/dependencies.xml Thu
Apr  1 07:16:04 2010
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<plugin-artifact xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
+    <module-id>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>openwebbeans</artifactId>
+        <version>3.0-SNAPSHOT</version>
+        <type>car</type>
+    </module-id>
+    <dependency>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>j2ee-server</artifactId>
+        <type>car</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-openwebbeans</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.openwebbeans</groupId>
+        <artifactId>openwebbeans-impl</artifactId>
+        <type>jar</type>
+    </dependency>
+
+    <dependency>
+        <groupId>dom4j</groupId>
+        <artifactId>dom4j</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>javassist</groupId>
+        <artifactId>javassist</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>net.sf.scannotation</groupId>
+        <artifactId>scannotation</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.openwebbeans</groupId>
+        <artifactId>openwebbeans-api</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>xml-apis</groupId>
+        <artifactId>xml-apis</artifactId>
+        <type>jar</type>
+    </dependency>
+</plugin-artifact>

Propchange: geronimo/sandbox/shawn/openwebbeans/openwebbeans/src/main/history/dependencies.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/sandbox/shawn/openwebbeans/openwebbeans/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/shawn/openwebbeans/openwebbeans/src/main/plan/plan.xml?rev=929867&view=auto
==============================================================================
--- geronimo/sandbox/shawn/openwebbeans/openwebbeans/src/main/plan/plan.xml (added)
+++ geronimo/sandbox/shawn/openwebbeans/openwebbeans/src/main/plan/plan.xml Thu Apr  1 07:16:04
2010
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    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.
+-->
+
+<!-- $Rev: 589946 $ $Date: 2007-10-29 19:53:25 -0700 (Mon, 29 Oct 2007) $ -->
+
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+
+    <gbean name="OpenWebBeansGBean" class="org.apache.geronimo.openwebbeans.OpenWebBeansGBean"/>
+
+</module>

Propchange: geronimo/sandbox/shawn/openwebbeans/openwebbeans/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/sandbox/shawn/openwebbeans/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/shawn/openwebbeans/pom.xml?rev=929867&view=auto
==============================================================================
--- geronimo/sandbox/shawn/openwebbeans/pom.xml (added)
+++ geronimo/sandbox/shawn/openwebbeans/pom.xml Thu Apr  1 07:16:04 2010
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    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.
+-->
+
+<!-- $Rev: 805240 $ $Date: 2009-08-17 18:02:22 -0700 (Mon, 17 Aug 2009) $ -->
+
+<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">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>plugins</artifactId>
+        <version>3.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>openwebbeans</artifactId>
+    <name>Geronimo Plugins, OpenWebBeans</name>
+    <packaging>pom</packaging>
+
+    <description>
+        OpenWebBeans plugin
+    </description>
+
+    <modules>
+        <module>geronimo-openwebbeans</module>
+        <module>geronimo-openwebbeans-builder</module>
+        <module>openwebbeans</module>
+        <module>openwebbeans-deployer</module>
+    </modules>
+    
+    <dependencyManagement>
+        <dependencies>
+	    <dependency>
+	        <groupId>org.apache.openwebbeans</groupId>
+		<artifactId>openwebbeans-impl</artifactId>
+		<version>1.0.0-incubating-SNAPSHOT</version>
+	    </dependency>
+	</dependencies>
+    </dependencyManagement>
+
+</project>

Propchange: geronimo/sandbox/shawn/openwebbeans/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message