geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From genspr...@apache.org
Subject svn commit: r1055328 - in /geronimo/server/trunk/plugins/wink: ./ geronimo-wink-builder/ geronimo-wink-builder/src/ geronimo-wink-builder/src/main/ geronimo-wink-builder/src/main/java/ geronimo-wink-builder/src/main/java/org/ geronimo-wink-builder/src/...
Date Wed, 05 Jan 2011 07:20:30 GMT
Author: genspring
Date: Wed Jan  5 07:20:29 2011
New Revision: 1055328

URL: http://svn.apache.org/viewvc?rev=1055328&view=rev
Log:
GERONIMO-5096, adding the wink integration boilerplate files.

Added:
    geronimo/server/trunk/plugins/wink/
    geronimo/server/trunk/plugins/wink/geronimo-wink/
    geronimo/server/trunk/plugins/wink/geronimo-wink-builder/
    geronimo/server/trunk/plugins/wink/geronimo-wink-builder/pom.xml
    geronimo/server/trunk/plugins/wink/geronimo-wink-builder/src/
    geronimo/server/trunk/plugins/wink/geronimo-wink-builder/src/main/
    geronimo/server/trunk/plugins/wink/geronimo-wink-builder/src/main/java/
    geronimo/server/trunk/plugins/wink/geronimo-wink-builder/src/main/java/org/
    geronimo/server/trunk/plugins/wink/geronimo-wink-builder/src/main/java/org/apache/
    geronimo/server/trunk/plugins/wink/geronimo-wink-builder/src/main/java/org/apache/geronimo/
    geronimo/server/trunk/plugins/wink/geronimo-wink-builder/src/main/java/org/apache/geronimo/wink/
    geronimo/server/trunk/plugins/wink/geronimo-wink-builder/src/main/java/org/apache/geronimo/wink/deployment/
    geronimo/server/trunk/plugins/wink/geronimo-wink-builder/src/main/java/org/apache/geronimo/wink/deployment/WinkModuleBuilderExtension.java
    geronimo/server/trunk/plugins/wink/geronimo-wink/pom.xml
    geronimo/server/trunk/plugins/wink/pom.xml
    geronimo/server/trunk/plugins/wink/wink/
    geronimo/server/trunk/plugins/wink/wink-deployer/
    geronimo/server/trunk/plugins/wink/wink-deployer/pom.xml
    geronimo/server/trunk/plugins/wink/wink-deployer/src/
    geronimo/server/trunk/plugins/wink/wink-deployer/src/main/
    geronimo/server/trunk/plugins/wink/wink-deployer/src/main/history/
    geronimo/server/trunk/plugins/wink/wink-deployer/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/wink/wink-deployer/src/main/plan/
    geronimo/server/trunk/plugins/wink/wink-deployer/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/wink/wink-tomcat-server/
    geronimo/server/trunk/plugins/wink/wink-tomcat-server/pom.xml
    geronimo/server/trunk/plugins/wink/wink/pom.xml
    geronimo/server/trunk/plugins/wink/wink/src/
    geronimo/server/trunk/plugins/wink/wink/src/main/
    geronimo/server/trunk/plugins/wink/wink/src/main/history/
    geronimo/server/trunk/plugins/wink/wink/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/wink/wink/src/main/plan/
    geronimo/server/trunk/plugins/wink/wink/src/main/plan/plan.xml

Added: geronimo/server/trunk/plugins/wink/geronimo-wink-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/wink/geronimo-wink-builder/pom.xml?rev=1055328&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/wink/geronimo-wink-builder/pom.xml (added)
+++ geronimo/server/trunk/plugins/wink/geronimo-wink-builder/pom.xml Wed Jan  5 07:20:29 2011
@@ -0,0 +1,66 @@
+<?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$ $Date$ -->
+
+<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>wink</artifactId>
+        <version>3.0-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.geronimo.modules</groupId>
+    <artifactId>geronimo-wink-builder</artifactId>
+    <packaging>bundle</packaging>
+    <name>Geronimo Plugins, wink :: Builder</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-j2ee-builder</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-web</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-wink</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jaxrs_1.1_spec</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-servlet_3.0_spec</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>

Added: geronimo/server/trunk/plugins/wink/geronimo-wink-builder/src/main/java/org/apache/geronimo/wink/deployment/WinkModuleBuilderExtension.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/wink/geronimo-wink-builder/src/main/java/org/apache/geronimo/wink/deployment/WinkModuleBuilderExtension.java?rev=1055328&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/wink/geronimo-wink-builder/src/main/java/org/apache/geronimo/wink/deployment/WinkModuleBuilderExtension.java (added)
+++ geronimo/server/trunk/plugins/wink/geronimo-wink-builder/src/main/java/org/apache/geronimo/wink/deployment/WinkModuleBuilderExtension.java Wed Jan  5 07:20:29 2011
@@ -0,0 +1,196 @@
+/**
+ * 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.wink.deployment;
+
+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.Set;
+import java.util.jar.JarFile;
+
+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.GBeanData;
+import org.apache.geronimo.gbean.annotation.GBean;
+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.web.info.WebAppInfo;
+import org.apache.openejb.jee.FacesConfig;
+import org.apache.openejb.jee.FacesManagedBean;
+import org.apache.openejb.jee.Servlet;
+import org.apache.openejb.jee.WebApp;
+import org.apache.wink.server.internal.servlet.RestServlet;
+import org.apache.xbean.finder.ClassFinder;
+import org.apache.xmlbeans.XmlObject;
+import org.osgi.framework.Bundle;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * @version $Rev $Date
+ */
+
+@GBean(j2eeType = NameFactory.MODULE_BUILDER)
+public class WinkModuleBuilderExtension implements ModuleBuilderExtension {
+
+    private static final Logger log = LoggerFactory.getLogger(WinkModuleBuilderExtension.class);
+
+    private final Environment defaultEnvironment;
+
+    private final NamingBuilder namingBuilders;
+
+    //private static final String CONTEXT_LISTENER_NAME = GeronimoStartupServletContextListener.class.getName();
+
+    private static final String FACES_SERVLET_NAME = RestServlet.class.getName();
+
+    /*public static final EARContext.Key<Set<ConfigurationResource>> JSF_META_INF_CONFIGURATION_RESOURCES = new EARContext.Key<Set<ConfigurationResource>>() {
+
+        @Override
+        public Set<ConfigurationResource> get(Map<EARContext.Key, Object> context) {
+            return (Set<ConfigurationResource>) context.get(this);
+        }
+    };*/
+
+    public WinkModuleBuilderExtension(@ParamAttribute(name = "defaultEnvironment") Environment defaultEnvironment,
+            @ParamReference(name = "NamingBuilders", namingType = NameFactory.MODULE_BUILDER) NamingBuilder namingBuilders) {
+        this.defaultEnvironment = defaultEnvironment;
+        this.namingBuilders = namingBuilders;
+    }
+
+    public void createModule(Module module, Bundle bundle, Naming naming, ModuleIDBuilder idBuilder) throws DeploymentException {
+        mergeEnvironment(module);
+    }
+
+    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 {
+        mergeEnvironment(module);
+    }
+
+    private void mergeEnvironment(Module module) {
+        if (!(module instanceof WebModule)) {
+            //not a web module, nothing to do
+            return;
+        }
+        WebModule webModule = (WebModule) module;
+        WebApp webApp = webModule.getSpecDD();
+        if (!hasRestServlet(webApp)) {
+            return;
+        }
+
+        EnvironmentBuilder.mergeEnvironments(module.getEnvironment(), defaultEnvironment);
+    }
+
+    public void installModule(JarFile earFile, EARContext earContext, Module module, Collection configurationStores, ConfigurationStore targetConfigurationStore, Collection repository)
+            throws DeploymentException {
+        if (!(module instanceof WebModule)) {
+            return;
+        }
+        
+        //module.getEarContext().getGeneralData().put(JSF_META_INF_CONFIGURATION_RESOURCES, findMetaInfConfigurationResources(earContext, module));
+    }
+
+    public void initContext(EARContext earContext, Module module, Bundle bundle) throws DeploymentException {
+    }
+
+    public void addGBeans(EARContext earContext, Module module, Bundle bundle, Collection repository) throws DeploymentException {
+        if (!(module instanceof WebModule)) {
+            //not a web module, nothing to do
+            return;
+        }
+        WebModule webModule = (WebModule) module;
+        WebApp webApp = webModule.getSpecDD();
+        if (!hasRestServlet(webApp)) {
+            return;
+        }
+
+        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);
+        // add myfaces listener
+        WebAppInfo webAppInfo = (WebAppInfo) webAppData.getAttribute("webAppInfo");
+        
+
+        AbstractName moduleName = moduleContext.getModuleName();
+        Map<EARContext.Key, Object> buildingContext = new HashMap<EARContext.Key, Object>();
+        buildingContext.put(NamingBuilder.GBEAN_NAME_KEY, moduleName);
+
+        //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();
+
+    }
+
+   
+
+    protected ClassFinder createWinkClassFinder(List<FacesConfig> facesConfigs, Set<Class> annotatedManagedBeanClasses, Bundle bundle) throws DeploymentException {
+        List<Class> managedBeanClasses = new ArrayList<Class>();
+        for (FacesConfig facesConfig : facesConfigs) {
+            for (FacesManagedBean managedBean : facesConfig.getManagedBean()) {
+                String className = managedBean.getManagedBeanClass().trim();
+                Class<?> clas;
+                try {
+                    clas = bundle.loadClass(className);
+                    while (clas != null) {
+                        managedBeanClasses.add(clas);
+                        clas = clas.getSuperclass();
+                    }
+                } catch (ClassNotFoundException e) {
+                    log.warn("WinkModuleBuilderExtension: Could not load managed bean class: " + className);
+                }
+            }
+        }
+        if (annotatedManagedBeanClasses != null) {
+            for (Class<?> clas : annotatedManagedBeanClasses) {
+                while (clas != null) {
+                    managedBeanClasses.add(clas);
+                    clas = clas.getSuperclass();
+                }
+            }
+        }
+        return new ClassFinder(managedBeanClasses);
+    }
+
+
+    private boolean hasRestServlet(WebApp webApp) {
+        for (Servlet servlet : webApp.getServlet()) {
+            if (servlet.getServletClass() != null && FACES_SERVLET_NAME.equals(servlet.getServletClass().trim())) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+}

Added: geronimo/server/trunk/plugins/wink/geronimo-wink/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/wink/geronimo-wink/pom.xml?rev=1055328&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/wink/geronimo-wink/pom.xml (added)
+++ geronimo/server/trunk/plugins/wink/geronimo-wink/pom.xml Wed Jan  5 07:20:29 2011
@@ -0,0 +1,121 @@
+<?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$ $Date$ -->
+
+<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>wink</artifactId>
+        <version>3.0-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.geronimo.modules</groupId>
+    <artifactId>geronimo-wink</artifactId>
+    <packaging>bundle</packaging>
+    <name>Geronimo Plugins, Wink :: Core</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-j2ee</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-web</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-wab</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-naming</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jaxrs_1.1_spec</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.wink</groupId>
+            <artifactId>wink-common</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.wink</groupId>
+            <artifactId>wink-server</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-validation_1.0_spec</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-annotation_1.1_spec</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-beanutils</groupId>
+            <artifactId>commons-beanutils</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.commons-codec</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.bundles</groupId>
+            <artifactId>commons-digester</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.bundles</groupId>
+            <artifactId>commons-discovery</artifactId>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

Added: geronimo/server/trunk/plugins/wink/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/wink/pom.xml?rev=1055328&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/wink/pom.xml (added)
+++ geronimo/server/trunk/plugins/wink/pom.xml Wed Jan  5 07:20:29 2011
@@ -0,0 +1,156 @@
+<?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$ $Date$ -->
+<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>wink</artifactId>
+    <name>Geronimo Plugins, Wink</name>
+    <packaging>pom</packaging>
+
+    <description>
+        Wink plugin
+    </description>
+
+    <properties>
+        <winkVersion>2.0.3-SNAPSHOT</winkVersion>
+    </properties>
+    
+    <modules>
+        <module>geronimo-wink</module>
+        <module>geronimo-wink-builder</module>
+        <module>wink</module>
+        <module>wink-deployer</module>
+    </modules>
+    <profiles>
+        <profile>
+            <id>mini-servers</id>
+            <modules>
+                <module>wink-tomcat-server</module>
+            </modules>
+        </profile>
+        <profile>
+            <id>all-subprojects</id>
+            <modules>
+                <module>geronimo-wink</module>
+                <module>geronimo-wink-builder</module>
+                <module>wink</module>
+                <module>wink-deployer</module>
+                <module>wink-tomcat-server</module>
+            </modules>
+        </profile>
+    </profiles>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.apache.wink</groupId>
+                <artifactId>wink-common</artifactId>
+                <version>1.1.2-incubating-SNAPSHOT</version>
+                <exclusions>                         
+                    <exclusion>
+                        <groupId>org.slf4j</groupId>
+                        <artifactId>slf4j-api</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>javax.xml.bind</groupId>
+                        <artifactId>jaxb-api</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>com.sun.xml.bind</groupId>
+                        <artifactId>jaxb-impl</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>javax.activation</groupId>
+                        <artifactId>activation</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>javax.ws.rs</groupId>
+                        <artifactId>jsr311-api</artifactId>
+                    </exclusion>                
+                    <exclusion>
+                        <groupId>org.apache.geronimo.specs</groupId>
+                        <artifactId>geronimo-annotation_1.1_spec</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            
+            <dependency>
+                <groupId>org.apache.wink</groupId>
+                <artifactId>wink-server</artifactId>
+                <version>1.1.2-incubating-SNAPSHOT</version>
+                <exclusions>                         
+                    <exclusion>
+                        <groupId>org.apache.wink</groupId>
+                        <artifactId>wink-common</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.slf4j</groupId>
+                        <artifactId>slf4j-api</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.geronimo.specs</groupId>
+                        <artifactId>geronimo-j2ee_1.4_spec</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.springframework</groupId>
+                        <artifactId>spring-test</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.slf4j</groupId>
+                        <artifactId>slf4j-jdk14</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>javax.ws.rs</groupId>
+                        <artifactId>jsr311-api</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>javax.xml.bind</groupId>
+                        <artifactId>jaxb-api</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>com.sun.xml.bind</groupId>
+                        <artifactId>jaxb-impl</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>javax.activation</groupId>
+                        <artifactId>activation</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>commons-lang</groupId>
+                        <artifactId>commons-lang</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jaxrs_1.1_spec</artifactId>
+            <version>1.0</version>
+        </dependency>            
+            
+        </dependencies>
+    </dependencyManagement>
+                
+</project>

Added: geronimo/server/trunk/plugins/wink/wink-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/wink/wink-deployer/pom.xml?rev=1055328&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/wink/wink-deployer/pom.xml (added)
+++ geronimo/server/trunk/plugins/wink/wink-deployer/pom.xml Wed Jan  5 07:20:29 2011
@@ -0,0 +1,86 @@
+<?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$ $Date$ -->
+
+<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>wink</artifactId>
+        <version>3.0-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.geronimo.configs</groupId>
+    <artifactId>wink-deployer</artifactId>
+    <name>Geronimo Plugins, wink :: Deployer</name>
+    <packaging>car</packaging>
+
+    <dependencies>
+        <!-- parent -->
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>j2ee-deployer</artifactId>
+            <version>${project.version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>wink</artifactId>
+            <version>${project.version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-wink-builder</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <configuration>
+                    <category>Web Services</category>
+                    <dependencies>
+                        <dependency>
+                            <groupId>org.apache.geronimo.configs</groupId>
+                            <artifactId>wink</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>

Added: geronimo/server/trunk/plugins/wink/wink-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/wink/wink-deployer/src/main/history/dependencies.xml?rev=1055328&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/wink/wink-deployer/src/main/history/dependencies.xml (added)
+++ geronimo/server/trunk/plugins/wink/wink-deployer/src/main/history/dependencies.xml Wed Jan  5 07:20:29 2011
@@ -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>wink-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>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>wink</artifactId>
+        <type>car</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-wink-builder</artifactId>
+        <type>jar</type>
+    </dependency>
+</plugin-artifact>

Added: geronimo/server/trunk/plugins/wink/wink-deployer/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/wink/wink-deployer/src/main/plan/plan.xml?rev=1055328&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/wink/wink-deployer/src/main/plan/plan.xml (added)
+++ geronimo/server/trunk/plugins/wink/wink-deployer/src/main/plan/plan.xml Wed Jan  5 07:20:29 2011
@@ -0,0 +1,44 @@
+<?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$ $Date$ -->
+
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+
+    <gbean name="WinkModuleBuilderExtension" class="org.apache.geronimo.wink.deployment.WinkModuleBuilderExtension">
+        <attribute name="providerFactoryNameQuery">?name=WinkLifecycleProviderFactory#org.apache.geronimo.wink.LifecycleProviderFactoryGBean</attribute>
+        <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>wink</artifactId>
+                        <version>${version}</version>
+                        <type>car</type>
+                    </dependency>
+                </dependencies>
+                <!-- This is a workaround for wired bundle cache in the BundleClassloader, add the import package explicitly to make sure the myface-core-impl is wired immediately the application bundle is resolved -->
+                <import-package>org.apache.Wink.ee6</import-package>
+            </environment>
+        </xml-attribute>
+    </gbean>
+
+</module>

Added: geronimo/server/trunk/plugins/wink/wink-tomcat-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/wink/wink-tomcat-server/pom.xml?rev=1055328&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/wink/wink-tomcat-server/pom.xml (added)
+++ geronimo/server/trunk/plugins/wink/wink-tomcat-server/pom.xml Wed Jan  5 07:20:29 2011
@@ -0,0 +1,113 @@
+<?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$ $Date$ -->
+
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>wink</artifactId>
+    <groupId>org.apache.geronimo.plugins</groupId>
+    <version>3.0-SNAPSHOT</version>
+  </parent>
+  <groupId>org.apache.geronimo.plugins</groupId>
+  <artifactId>wink-tomcat-server</artifactId>
+  <name>Geronimo Plugins, wink :: tomcat based wink mini server</name>
+  <packaging>server-assembly</packaging>
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.geronimo.buildsupport</groupId>
+          <artifactId>car-maven-plugin</artifactId>
+          <version>${project.version}</version>
+          <extensions>true</extensions>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.geronimo.buildsupport</groupId>
+        <artifactId>car-maven-plugin</artifactId>
+        <configuration>
+          <servers>
+            <serverInstance>
+              <name>default</name>
+              <configFile>var/config/config.xml</configFile>
+              <configSubstitutionsFile>var/config/config-substitutions.properties</configSubstitutionsFile>
+              <configSubstitutionsPrefix>org.apache.geronimo.config.substitution.</configSubstitutionsPrefix>
+              <artifactAliasesFile>var/config/artifact_aliases.properties</artifactAliasesFile>
+            </serverInstance>
+            <serverInstance>
+              <name>client</name>
+              <attributeManagerFrom>default</attributeManagerFrom>
+              <artifactAliasesFile>var/config/client_artifact_aliases.properties</artifactAliasesFile>
+            </serverInstance>
+            <serverInstance>
+              <name>offline</name>
+              <configFile>var/config/offline-deployer-config.xml</configFile>
+              <configSubstitutionsFile>var/config/config-substitutions.properties</configSubstitutionsFile>
+              <configSubstitutionsPrefix>org.apache.geronimo.config.substitution.</configSubstitutionsPrefix>
+              <artifactAliasesFile>var/config/artifact_aliases.properties</artifactAliasesFile>
+            </serverInstance>
+            <serverInstance>
+              <name>jsr88</name>
+              <configFile>var/config/jsr88-configurer-config.xml</configFile>
+              <configSubstitutionsFile>var/config/config-substitutions.properties</configSubstitutionsFile>
+              <configSubstitutionsPrefix>org.apache.geronimo.config.substitution.</configSubstitutionsPrefix>
+              <artifactAliasesFile>var/config/artifact_aliases.properties</artifactAliasesFile>
+            </serverInstance>
+          </servers>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.geronimo.framework</groupId>
+      <artifactId>karaf-framework</artifactId>
+      <version>${project.version}</version>
+      <type>car</type>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.configs</groupId>
+      <artifactId>tomcat7</artifactId>
+      <version>${project.version}</version>
+      <type>car</type>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.configs</groupId>
+      <artifactId>tomcat7-deployer</artifactId>
+      <version>${project.version}</version>
+      <type>car</type>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.configs</groupId>
+      <artifactId>wink</artifactId>
+      <version>${project.version}</version>
+      <type>car</type>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.configs</groupId>
+      <artifactId>wink-deployer</artifactId>
+      <version>${project.version}</version>
+      <type>car</type>
+    </dependency>
+  </dependencies>
+</project>

Added: geronimo/server/trunk/plugins/wink/wink/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/wink/wink/pom.xml?rev=1055328&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/wink/wink/pom.xml (added)
+++ geronimo/server/trunk/plugins/wink/wink/pom.xml Wed Jan  5 07:20:29 2011
@@ -0,0 +1,99 @@
+<?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$ $Date$ -->
+
+<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>wink</artifactId>
+        <version>3.0-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.geronimo.configs</groupId>
+    <artifactId>wink</artifactId>
+    <name>Geronimo Plugins, wink :: wink</name>
+    <packaging>car</packaging>
+
+    <description>Geronimo wink jsf integration</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-gbean-deployer</artifactId>
+            <version>${project.version}</version>
+            <type>car</type>
+        </dependency>
+
+        <!-- parent -->
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>j2ee-server</artifactId>
+            <version>${project.version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-servlet_3.0_spec</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-wink</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.wink</groupId>
+            <artifactId>wink-common</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.wink</groupId>
+            <artifactId>wink-server</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jaxrs_1.1_spec</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-collections</groupId>
+            <artifactId>commons-collections</artifactId>
+        </dependency>  
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <configuration>
+                    <category>Web Services</category>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

Added: geronimo/server/trunk/plugins/wink/wink/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/wink/wink/src/main/history/dependencies.xml?rev=1055328&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/wink/wink/src/main/history/dependencies.xml (added)
+++ geronimo/server/trunk/plugins/wink/wink/src/main/history/dependencies.xml Wed Jan  5 07:20:29 2011
@@ -0,0 +1,104 @@
+<?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>wink</artifactId>
+        <version>3.0-SNAPSHOT</version>
+        <type>car</type>
+    </module-id>
+    <dependency>
+        <groupId>commons-beanutils</groupId>
+        <artifactId>commons-beanutils</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>commons-collections</groupId>
+        <artifactId>commons-collections</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.bundles</groupId>
+        <artifactId>commons-digester</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.bundles</groupId>
+        <artifactId>commons-discovery</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.components</groupId>
+        <artifactId>geronimo-jaspi</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>j2ee-server</artifactId>
+        <type>car</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-gbean-deployer</artifactId>
+        <type>car</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-security</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-j2ee-schema</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-wab</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-web</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-wink</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-jacc_1.4_spec</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-jaspic_1.0_spec</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-jaxrs_1.1_spec</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.openejb</groupId>
+        <artifactId>openejb-jee</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.servicemix.bundles</groupId>
+        <artifactId>org.apache.servicemix.bundles.commons-codec</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.wink</groupId>
+        <artifactId>wink-common</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.wink</groupId>
+        <artifactId>wink-server</artifactId>
+        <type>jar</type>
+    </dependency>
+</plugin-artifact>

Added: geronimo/server/trunk/plugins/wink/wink/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/wink/wink/src/main/plan/plan.xml?rev=1055328&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/wink/wink/src/main/plan/plan.xml (added)
+++ geronimo/server/trunk/plugins/wink/wink/src/main/plan/plan.xml Wed Jan  5 07:20:29 2011
@@ -0,0 +1,23 @@
+<?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$ $Date$ -->
+
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+
+</module>



Mime
View raw message