You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by we...@apache.org on 2012/11/06 14:32:18 UTC
svn commit: r1406130 [1/2] - in /myfaces/extensions/scripting/trunk:
extscript-core-root/
extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/api/
extscript-core-root/extscript-weld/ extscript-core-root/extscri...
Author: werpu
Date: Tue Nov 6 13:32:16 2012
New Revision: 1406130
URL: http://svn.apache.org/viewvc?rev=1406130&view=rev
Log:
https://issues.apache.org/jira/browse/EXTSCRIPT-180 adding basic weld support code, but not much, does not work yet
Added:
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-weld/
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-weld/pom.xml
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-weld/src/
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-weld/src/main/
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-weld/src/main/java/
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-weld/src/main/java/org/
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-weld/src/main/java/org/apache/
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-weld/src/main/java/org/apache/myfaces/
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-weld/src/main/java/org/apache/myfaces/extension/
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-weld/src/main/java/org/apache/myfaces/extension/scripting/
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-weld/src/main/java/org/apache/myfaces/extension/scripting/weld/
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-weld/src/main/java/org/apache/myfaces/extension/scripting/weld/api/
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-weld/src/main/java/org/apache/myfaces/extension/scripting/weld/api/CdiContainer.java
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-weld/src/main/java/org/apache/myfaces/extension/scripting/weld/api/CdiContainerLoader.java
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-weld/src/main/java/org/apache/myfaces/extension/scripting/weld/api/ContextControl.java
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-weld/src/main/java/org/apache/myfaces/extension/scripting/weld/core/
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-weld/src/main/java/org/apache/myfaces/extension/scripting/weld/core/CDIThrowAwayClassloader.java
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-weld/src/main/java/org/apache/myfaces/extension/scripting/weld/core/ReloadingListener.java
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-weld/src/main/java/org/apache/myfaces/extension/scripting/weld/startup/
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-weld/src/main/java/org/apache/myfaces/extension/scripting/weld/startup/Listener.java
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-weld/src/main/java/org/apache/myfaces/extension/scripting/weld/startup/StartupExtension.java
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-weld/src/main/java/org/apache/myfaces/extension/scripting/weld/startup/WeldBootstrapListener.java
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-weld/src/main/resources/
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-weld/src/main/resources/META-INF/
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-weld/src/main/resources/META-INF/beans.xml
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-weld/src/main/resources/META-INF/services/
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-weld/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
myfaces/extensions/scripting/trunk/extscript-examples/weld-example/
myfaces/extensions/scripting/trunk/extscript-examples/weld-example/pom.xml
myfaces/extensions/scripting/trunk/extscript-examples/weld-example/src/
myfaces/extensions/scripting/trunk/extscript-examples/weld-example/src/main/
myfaces/extensions/scripting/trunk/extscript-examples/weld-example/src/main/resources/
myfaces/extensions/scripting/trunk/extscript-examples/weld-example/src/main/resources/META-INF/
myfaces/extensions/scripting/trunk/extscript-examples/weld-example/src/main/resources/META-INF/LICENSE.TXT
myfaces/extensions/scripting/trunk/extscript-examples/weld-example/src/main/resources/META-INF/NOTICE.TXT
myfaces/extensions/scripting/trunk/extscript-examples/weld-example/src/main/resources/META-INF/beans.xml
myfaces/extensions/scripting/trunk/extscript-examples/weld-example/src/main/resources/META-INF/licenses/
myfaces/extensions/scripting/trunk/extscript-examples/weld-example/src/main/resources/META-INF/licenses/asm-license.txt
myfaces/extensions/scripting/trunk/extscript-examples/weld-example/src/main/resources/META-INF/licenses/facelets-license.txt
myfaces/extensions/scripting/trunk/extscript-examples/weld-example/src/main/resources/META-INF/licenses/scala-license.txt
myfaces/extensions/scripting/trunk/extscript-examples/weld-example/src/main/webapp/
myfaces/extensions/scripting/trunk/extscript-examples/weld-example/src/main/webapp/META-INF/
myfaces/extensions/scripting/trunk/extscript-examples/weld-example/src/main/webapp/META-INF/context.xml
myfaces/extensions/scripting/trunk/extscript-examples/weld-example/src/main/webapp/WEB-INF/
myfaces/extensions/scripting/trunk/extscript-examples/weld-example/src/main/webapp/WEB-INF/faces-config.xml
myfaces/extensions/scripting/trunk/extscript-examples/weld-example/src/main/webapp/WEB-INF/glassfish-web.xml
myfaces/extensions/scripting/trunk/extscript-examples/weld-example/src/main/webapp/WEB-INF/java/
myfaces/extensions/scripting/trunk/extscript-examples/weld-example/src/main/webapp/WEB-INF/java/JavaHello.java
myfaces/extensions/scripting/trunk/extscript-examples/weld-example/src/main/webapp/WEB-INF/sun-web.xml
myfaces/extensions/scripting/trunk/extscript-examples/weld-example/src/main/webapp/WEB-INF/web.xml
myfaces/extensions/scripting/trunk/extscript-examples/weld-example/src/main/webapp/helloWorld.xhtml
Modified:
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/api/Configuration.java
myfaces/extensions/scripting/trunk/extscript-core-root/pom.xml
myfaces/extensions/scripting/trunk/extscript-examples/pom.xml
myfaces/extensions/scripting/trunk/src/site/mdtext/download.mdtext
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/api/Configuration.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/api/Configuration.java?rev=1406130&r1=1406129&r2=1406130&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/api/Configuration.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/api/Configuration.java Tue Nov 6 13:32:16 2012
@@ -327,6 +327,10 @@ public class Configuration
return _compileTarget;
}
+ public File getCompileTarget(String appendix) {
+ return new File(_compileTarget.getAbsolutePath()+appendix);
+ }
+
public void setCompileTarget(File compileTarget)
{
_compileTarget = compileTarget;
Added: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-weld/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-weld/pom.xml?rev=1406130&view=auto
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-weld/pom.xml (added)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-weld/pom.xml Tue Nov 6 13:32:16 2012
@@ -0,0 +1,65 @@
+<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>
+ <artifactId>extscript-weld</artifactId>
+ <version>1.0.5-SNAPSHOT</version>
+ <packaging>jar</packaging>
+ <name>MyFaces Extension Scripting Core for Apache OWB</name>
+
+ <description>
+ Core of the MyFaces extensions.scripting
+ </description>
+
+ <parent>
+ <groupId>org.apache.myfaces.extensions.scripting</groupId>
+ <artifactId>extscript-core-root</artifactId>
+ <version>1.0.5-SNAPSHOT</version>
+ </parent>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.myfaces.extensions.scripting</groupId>
+ <artifactId>extscript-core</artifactId>
+ <version>1.0.5-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-api</artifactId>
+ <version>1.1.Final</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.weld.servlet</groupId>
+ <artifactId>weld-servlet</artifactId>
+ <version>1.1.10.Final</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.2.1-b03</version>
+ <scope>provided</scope>
+ </dependency>
+ <!--
+ <dependency>
+ <groupId>org.apache.deltaspike.core</groupId>
+ <artifactId>deltaspike-core-api</artifactId>
+ <version>0.4-incubating-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.deltaspike.core</groupId>
+ <artifactId>deltaspike-core-impl</artifactId>
+ <version>0.4-incubating-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.deltaspike.cdictrl</groupId>
+ <artifactId>deltaspike-cdictrl-api</artifactId>
+ <version>0.4-incubating-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.deltaspike.cdictrl</groupId>
+ <artifactId>deltaspike-cdictrl-weld</artifactId>
+ <version>0.4-incubating-SNAPSHOT</version>
+ </dependency>
+ -->
+ </dependencies>
+</project>
\ No newline at end of file
Added: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-weld/src/main/java/org/apache/myfaces/extension/scripting/weld/api/CdiContainer.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-weld/src/main/java/org/apache/myfaces/extension/scripting/weld/api/CdiContainer.java?rev=1406130&view=auto
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-weld/src/main/java/org/apache/myfaces/extension/scripting/weld/api/CdiContainer.java (added)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-weld/src/main/java/org/apache/myfaces/extension/scripting/weld/api/CdiContainer.java Tue Nov 6 13:32:16 2012
@@ -0,0 +1,65 @@
+/*
+ * 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.myfaces.extension.scripting.weld.api;
+
+
+
+import javax.enterprise.inject.spi.BeanManager;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletContextEvent;
+import javax.servlet.http.HttpSession;
+
+/**
+ * <p>A CdiTestContainer provides access to an underlying JSR-299 (CDI)
+ * Container. It allows starting and stopping the container and to start
+ * and stop the built-in contexts of that container.</p>
+ *
+ * <p>The intention is to provide a portable control for CDI containers in
+ * Java SE environments. It is <b>not</b> intended for environments in which the
+ * CDI container is under full control of the server already, e.g. in
+ * EE-containers.</p>
+ */
+public interface CdiContainer
+{
+ /**
+ * Booting the CdiTestContainer will scan the whole classpath
+ * for Beans and extensions available.
+ * The container might throw a DeploymentException or similar on startup.
+ */
+ void boot(ServletContextEvent context);
+
+ /**
+ * This will shutdown the underlying CDI container.
+ */
+ void shutdown(ServletContextEvent context);
+
+
+ /**
+ * @return the {@link javax.enterprise.inject.spi.BeanManager} or <code>null</code> it not available
+ */
+ BeanManager getBeanManager();
+
+ /**
+ * @return ContextControl for the started Container. <code>null</code> if the container is not yet started
+ */
+ ContextControl getContextControl(ServletContext context, HttpSession session);
+
+}
+
Added: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-weld/src/main/java/org/apache/myfaces/extension/scripting/weld/api/CdiContainerLoader.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-weld/src/main/java/org/apache/myfaces/extension/scripting/weld/api/CdiContainerLoader.java?rev=1406130&view=auto
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-weld/src/main/java/org/apache/myfaces/extension/scripting/weld/api/CdiContainerLoader.java (added)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-weld/src/main/java/org/apache/myfaces/extension/scripting/weld/api/CdiContainerLoader.java Tue Nov 6 13:32:16 2012
@@ -0,0 +1,82 @@
+/*
+ * 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.myfaces.extension.scripting.weld.api;
+
+
+import java.util.Iterator;
+import java.util.ServiceLoader;
+
+/**
+ * <p>This class provides access to the ContainerControl.</p>
+ * <p>It uses the {@code java.util.ServiceLoader} mechanism to
+ * automatically pickup the container providers from the classpath.</p>
+ */
+public final class CdiContainerLoader
+{
+ private CdiContainerLoader()
+ {
+ // private ct to prevent instantiation
+ }
+
+
+ public static CdiContainer getCdiContainer()
+ {
+ CdiContainer testContainer;
+
+ //doesn't support the implementation loader (there is no dependency to owb-impl
+ ServiceLoader<CdiContainer> cdiContainerLoader = ServiceLoader.load(CdiContainer.class);
+ Iterator<CdiContainer> cdiIt = cdiContainerLoader.iterator();
+ if (cdiIt.hasNext())
+ {
+ testContainer = cdiIt.next();
+ }
+ else
+ {
+ throw new IllegalStateException("Could not find an implementation of " + CdiContainer.class.getName() +
+ " available in the classpath!");
+ }
+
+ if (cdiIt.hasNext())
+ {
+ String foundContainers = getContainerDetails();
+ throw new IllegalStateException("Too many implementations of " + CdiContainer.class.getName() +
+ " found in the classpath! Details: " + foundContainers);
+ }
+
+ return testContainer;
+ }
+
+ private static String getContainerDetails()
+ {
+ StringBuilder result = new StringBuilder();
+
+ Class containerClass;
+ for (CdiContainer cdiContainer : ServiceLoader.load(CdiContainer.class))
+ {
+ containerClass = cdiContainer.getClass();
+ result.append(containerClass.getProtectionDomain().getCodeSource().getLocation().toExternalForm());
+ result.append(containerClass.getName());
+
+ result.append(System.getProperty("line.separator"));
+ }
+
+ return result.toString();
+ }
+}
Added: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-weld/src/main/java/org/apache/myfaces/extension/scripting/weld/api/ContextControl.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-weld/src/main/java/org/apache/myfaces/extension/scripting/weld/api/ContextControl.java?rev=1406130&view=auto
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-weld/src/main/java/org/apache/myfaces/extension/scripting/weld/api/ContextControl.java (added)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-weld/src/main/java/org/apache/myfaces/extension/scripting/weld/api/ContextControl.java Tue Nov 6 13:32:16 2012
@@ -0,0 +1,65 @@
+/*
+ * 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.myfaces.extension.scripting.weld.api;
+
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpSession;
+import java.lang.annotation.Annotation;
+
+/**
+ * Control native CDI Container Contexts.
+ * Just inject this interface and you gain manual access over built-in Contexts.
+ * The respective integration code will provide a &064;Dependent scoped instance.
+ */
+public interface ContextControl
+{
+ /**
+ * This will start all container built-in Contexts
+ */
+ void startContexts();
+
+ /**
+ * Stop all container built-in Contexts and destroy all beans properly
+ */
+ void stopContexts();
+
+ /**
+ * Start the specified scope. This only works for scopes which are handled
+ * by the CDI container itself. Custom scoped of 3rd party
+ * Context implementations shall be started directly (they are portable anyway).
+ *
+ * @param scopeClass e.g. RequestScoped.class
+ */
+ void startContext(Class<? extends Annotation> scopeClass);
+
+ /**
+ * Stop the specified scope. This only works for scopes which are handled
+ * by the CDI container itself. Custom scoped of 3rd party
+ * Context implementations shall be stopped directly (they are portable anyway).
+ *
+ * @param scopeClass e.g. RequestScoped.class
+ */
+ void stopContext(Class<? extends Annotation> scopeClass);
+
+
+ void setSession(HttpSession session);
+
+ void setServletContext(ServletContext servletContext);
+}
Added: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-weld/src/main/java/org/apache/myfaces/extension/scripting/weld/core/CDIThrowAwayClassloader.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-weld/src/main/java/org/apache/myfaces/extension/scripting/weld/core/CDIThrowAwayClassloader.java?rev=1406130&view=auto
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-weld/src/main/java/org/apache/myfaces/extension/scripting/weld/core/CDIThrowAwayClassloader.java (added)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-weld/src/main/java/org/apache/myfaces/extension/scripting/weld/core/CDIThrowAwayClassloader.java Tue Nov 6 13:32:16 2012
@@ -0,0 +1,146 @@
+/*
+ * 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.myfaces.extension.scripting.weld.core;
+
+import org.apache.myfaces.extensions.scripting.core.api.WeavingContext;
+import org.apache.myfaces.extensions.scripting.core.engine.ThrowAwayClassloader;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Enumeration;
+
+/**
+ * @author Werner Punz (latest modification by $Author$)
+ * @version $Revision$ $Date$
+ * <p/>
+ * We use
+ */
+
+public class CDIThrowAwayClassloader extends ClassLoader
+{
+ ThrowAwayClassloader _delegate;
+
+ public CDIThrowAwayClassloader(ClassLoader classLoader)
+ {
+ super(classLoader);
+ _delegate = new ThrowAwayClassloader(classLoader);
+ }
+
+ public CDIThrowAwayClassloader()
+ {
+ super();
+ _delegate = new ThrowAwayClassloader();
+ }
+
+ @Override
+ public Class<?> loadClass(String className) throws ClassNotFoundException
+ {
+ return _delegate.loadClass(className);
+ }
+
+ @Override
+ public InputStream getResourceAsStream(String name)
+ {
+ return _delegate.getResourceAsStream(name);
+ }
+
+ @Override
+ public URL getResource(String s)
+ {
+ if (s.contains("META-INF/beans.xml"))
+ {
+ //return target dir
+ try
+ {
+ return WeavingContext.getInstance().getConfiguration().getCompileTarget().toURI().toURL();
+ }
+ catch (MalformedURLException e)
+ {
+ //cannot really happen
+ e.printStackTrace();
+ }
+ return null;
+ }
+ return _delegate.getResource(s);
+ }
+
+ @Override
+ public Enumeration<URL> getResources(String s) throws IOException
+ {
+ Enumeration<URL> urls = _delegate.getResources(s);
+ if (s.contains("META-INF/beans.xml"))
+ {
+ ArrayList<URL> tmpList = Collections.list(urls);
+ //WeavingContext.getInstance().getConfiguration().getCompileTarget("/META-INF/beans.xml").mkdirs();
+ tmpList.add(WeavingContext.getInstance().getConfiguration().getCompileTarget("/META-INF/beans.xml").toURI().toURL());
+ return Collections.enumeration(tmpList);
+ }
+ return urls;
+ }
+
+ public static URL getSystemResource(String s)
+ {
+ return ClassLoader.getSystemResource(s);
+ }
+
+ public static Enumeration<URL> getSystemResources(String s) throws IOException
+ {
+ return ClassLoader.getSystemResources(s);
+ }
+
+ public static InputStream getSystemResourceAsStream(String s)
+ {
+ return ClassLoader.getSystemResourceAsStream(s);
+ }
+
+ public static ClassLoader getSystemClassLoader()
+ {
+ return ClassLoader.getSystemClassLoader();
+ }
+
+
+ @Override
+ public void setDefaultAssertionStatus(boolean b)
+ {
+ _delegate.setDefaultAssertionStatus(b);
+ }
+
+ @Override
+ public void setPackageAssertionStatus(String s, boolean b)
+ {
+ _delegate.setPackageAssertionStatus(s, b);
+ }
+
+ @Override
+ public void setClassAssertionStatus(String s, boolean b)
+ {
+ _delegate.setClassAssertionStatus(s, b);
+ }
+
+ @Override
+ public void clearAssertionStatus()
+ {
+ _delegate.clearAssertionStatus();
+ }
+}
Added: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-weld/src/main/java/org/apache/myfaces/extension/scripting/weld/core/ReloadingListener.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-weld/src/main/java/org/apache/myfaces/extension/scripting/weld/core/ReloadingListener.java?rev=1406130&view=auto
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-weld/src/main/java/org/apache/myfaces/extension/scripting/weld/core/ReloadingListener.java (added)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-weld/src/main/java/org/apache/myfaces/extension/scripting/weld/core/ReloadingListener.java Tue Nov 6 13:32:16 2012
@@ -0,0 +1,67 @@
+/*
+ * 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.myfaces.extension.scripting.weld.core;
+
+//import org.apache.deltaspike.cdise.api.ContextControl;
+//import org.apache.deltaspike.core.api.provider.BeanProvider;
+import org.apache.myfaces.extensions.scripting.core.api.eventhandling.WeavingEvent;
+import org.apache.myfaces.extensions.scripting.core.api.eventhandling.WeavingEventListener;
+import org.apache.myfaces.extensions.scripting.core.api.eventhandling.events.RefreshBeginEvent;
+import org.apache.myfaces.extensions.scripting.core.api.eventhandling.events.TaintedEvent;
+
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import java.util.logging.Logger;
+
+/**
+ * @author Werner Punz (latest modification by $Author$)
+ * @version $Revision$ $Date$
+ */
+public class ReloadingListener implements WeavingEventListener
+{
+ boolean _tainted = false;
+ ServletContext context;
+
+ Logger log = Logger.getLogger(this.getClass().getName());
+
+ @Override
+ public void onEvent(WeavingEvent evt)
+ {
+ if (evt instanceof TaintedEvent)
+ {
+ _tainted = true;
+ } else if (evt instanceof RefreshBeginEvent)
+ {
+ if (_tainted)
+ {
+ ServletContext context = ((HttpServletRequest) ((RefreshBeginEvent) evt).getRequest())
+ .getServletContext();
+
+
+ //ContextControl ctxCtrl = BeanProvider.getContextualReference(ContextControl.class);
+ //ctxCtrl.stopContexts();
+ //ctxCtrl.startContexts();
+ }
+ }
+
+ }
+
+
+}
Added: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-weld/src/main/java/org/apache/myfaces/extension/scripting/weld/startup/Listener.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-weld/src/main/java/org/apache/myfaces/extension/scripting/weld/startup/Listener.java?rev=1406130&view=auto
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-weld/src/main/java/org/apache/myfaces/extension/scripting/weld/startup/Listener.java (added)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-weld/src/main/java/org/apache/myfaces/extension/scripting/weld/startup/Listener.java Tue Nov 6 13:32:16 2012
@@ -0,0 +1,232 @@
+/*
+ * 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.myfaces.extension.scripting.weld.startup;
+
+import javassist.util.proxy.ProxyFactory;
+import javassist.util.proxy.ProxyFactory.ClassLoaderProvider;
+import org.jboss.weld.bootstrap.api.Bootstrap;
+import org.jboss.weld.bootstrap.api.Environments;
+import org.jboss.weld.environment.Container;
+import org.jboss.weld.environment.ContainerContext;
+import org.jboss.weld.environment.gwtdev.GwtDevHostedModeContainer;
+import org.jboss.weld.environment.jetty.Jetty6Container;
+import org.jboss.weld.environment.jetty.Jetty7Container;
+import org.jboss.weld.environment.jetty.JettyPost72Container;
+import org.jboss.weld.environment.servlet.deployment.ServletDeployment;
+import org.jboss.weld.environment.servlet.deployment.URLScanner;
+import org.jboss.weld.environment.servlet.deployment.VFSURLScanner;
+import org.jboss.weld.environment.servlet.services.ServletResourceInjectionServices;
+import org.jboss.weld.environment.servlet.util.Reflections;
+import org.jboss.weld.environment.servlet.util.ServiceLoader;
+import org.jboss.weld.environment.tomcat.Tomcat6Container;
+import org.jboss.weld.environment.tomcat7.Tomcat7Container;
+import org.jboss.weld.injection.spi.ResourceInjectionServices;
+import org.jboss.weld.manager.api.WeldManager;
+import org.jboss.weld.servlet.api.ServletListener;
+import org.jboss.weld.servlet.api.helpers.ForwardingServletListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.el.ELContextListener;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletContextEvent;
+import javax.servlet.jsp.JspApplicationContext;
+import javax.servlet.jsp.JspFactory;
+import java.util.Arrays;
+
+/**
+ * @author Pete Muir
+ * @author Ales Justin
+ */
+public class Listener extends ForwardingServletListener {
+ private static final Logger log = LoggerFactory.getLogger(Listener.class);
+
+ private static final String BOOTSTRAP_IMPL_CLASS_NAME = "org.jboss.weld.bootstrap.WeldBootstrap";
+ private static final String WELD_LISTENER_CLASS_NAME = "org.jboss.weld.servlet.WeldListener";
+ private static final String EXPRESSION_FACTORY_NAME = "org.jboss.weld.el.ExpressionFactory";
+ public static final String BEAN_MANAGER_ATTRIBUTE_NAME = Listener.class.getPackage().getName() + "." +
+ BeanManager.class.getName();
+
+ private final transient Bootstrap bootstrap;
+ private final transient ServletListener weldListener;
+ private Container container;
+
+ public Listener() {
+ try {
+ bootstrap = Reflections.newInstance(BOOTSTRAP_IMPL_CLASS_NAME);
+ } catch (IllegalArgumentException e) {
+ throw new IllegalStateException("Error loading Weld bootstrap, check that Weld is on the classpath", e);
+ }
+ try {
+ weldListener = Reflections.newInstance(WELD_LISTENER_CLASS_NAME);
+ } catch (IllegalArgumentException e) {
+ throw new IllegalStateException("Error loading Weld listener, check that Weld is on the classpath", e);
+ }
+ }
+
+ @Override
+ public void contextDestroyed(ServletContextEvent sce) {
+ bootstrap.shutdown();
+
+ if (container != null)
+ container.destroy(new ContainerContext(sce, null));
+
+ super.contextDestroyed(sce);
+ }
+
+ /**
+ * Create server deployment.
+ * <p/>
+ * Can be overridden with custom servlet deployment.
+ * e.g. exact resources listing in ristricted wnv like GAE
+ *
+ * @param context the servlet context
+ * @param bootstrap the bootstrap
+ * @return new servlet deployment
+ */
+ protected ServletDeployment createServletDeployment(ServletContext context, Bootstrap bootstrap) {
+ return new ServletDeployment(context, bootstrap);
+ }
+
+ /**
+ * Get appropriate scanner.
+ * Return null to leave it to defaults.
+ *
+ * @param classLoader the classloader
+ * @param context the servlet context
+ * @return custom url scanner or null if we should use default
+ */
+ protected URLScanner createUrlScanner(ClassLoader classLoader, ServletContext context) {
+ try {
+ classLoader.loadClass("org.jboss.virtual.VFS"); // check if we can use JBoss VFS
+ return new VFSURLScanner(classLoader);
+ } catch (Throwable t) {
+ return null;
+ }
+ }
+
+ @Override
+ public void contextInitialized(ServletContextEvent sce) {
+ // Make Javassist always use the TCCL to load classes
+ ProxyFactory.classLoaderProvider = new ClassLoaderProvider() {
+
+ public ClassLoader get(ProxyFactory pf) {
+ return Thread.currentThread().getContextClassLoader();
+ }
+
+ };
+
+ ClassLoader classLoader = Reflections.getClassLoader();
+ ServletContext context = sce.getServletContext();
+
+ URLScanner scanner = createUrlScanner(classLoader, context);
+ if (scanner != null) {
+ context.setAttribute(URLScanner.class.getName(), scanner);
+ }
+
+ ServletDeployment deployment = createServletDeployment(context, bootstrap);
+ try {
+ deployment.getWebAppBeanDeploymentArchive().getServices().add(
+ ResourceInjectionServices.class, new ServletResourceInjectionServices() {
+ });
+ } catch (NoClassDefFoundError e) {
+ // Support GAE
+ log.warn("@Resource injection not available in simple beans");
+ }
+
+ bootstrap.startContainer(Environments.SERVLET, deployment).startInitialization();
+ WeldManager manager = bootstrap.getManager(deployment.getWebAppBeanDeploymentArchive());
+
+ ContainerContext cc = new ContainerContext(sce, manager);
+ StringBuilder dump = new StringBuilder();
+ Container container = findContainer(cc, dump);
+ if (container == null) {
+ log.info("No supported servlet container detected, CDI injection will NOT be available" +
+ " in Servlets, Filters or Listeners");
+ if (log.isDebugEnabled())
+ log.debug("Exception dump from Container lookup: " + dump);
+ } else {
+ container.initialize(cc);
+ this.container = container;
+ }
+
+ // Push the manager into the servlet context so we can access in JSF
+ context.setAttribute(BEAN_MANAGER_ATTRIBUTE_NAME, manager);
+
+ if (JspFactory.getDefaultFactory() != null) {
+ JspApplicationContext jspApplicationContext = JspFactory.getDefaultFactory().
+ getJspApplicationContext(context);
+
+ // Register the ELResolver with JSP
+ jspApplicationContext.addELResolver(manager.getELResolver());
+
+ // Register ELContextListener with JSP
+ jspApplicationContext.addELContextListener(
+ Reflections.<ELContextListener>newInstance("org.jboss.weld.el.WeldELContextListener"));
+
+ // Push the wrapped expression factory into the servlet context so that Tomcat or Jetty can hook it in using a container code
+ context.setAttribute(EXPRESSION_FACTORY_NAME, manager.wrapExpressionFactory(
+ jspApplicationContext.getExpressionFactory()));
+ }
+
+ bootstrap.deployBeans().validateBeans().endInitialization();
+ super.contextInitialized(sce);
+ }
+
+ @Override
+ protected ServletListener delegate() {
+ return weldListener;
+ }
+
+ /**
+ * Find container env.
+ *
+ * @param cc the container context
+ * @param dump the exception dump
+ * @return valid container or null
+ */
+ protected Container findContainer(ContainerContext cc, StringBuilder dump) {
+ Iterable<Container> extContainers = ServiceLoader.load(Container.class, getClass().getClassLoader());
+ Container container = checkContainers(cc, dump, extContainers);
+ if (container == null)
+ container = checkContainers(cc, dump, Arrays.asList(
+ // Needs to be first: gwt-dev jar has tomcat classes but uses jetty
+ GwtDevHostedModeContainer.INSTANCE,
+ Tomcat7Container.INSTANCE,
+ Tomcat6Container.INSTANCE,
+ Jetty6Container.INSTANCE,
+ JettyPost72Container.INSTANCE,
+ Jetty7Container.INSTANCE)
+ );
+ return container;
+ }
+
+ protected Container checkContainers(ContainerContext cc, StringBuilder dump, Iterable<Container> containers) {
+ for (Container c : containers) {
+ try {
+ if (c.touch(cc))
+ return c;
+ } catch (Throwable t) {
+ dump.append(c).append("->").append(t.getMessage()).append("\n");
+ }
+ }
+ return null;
+ }
+}
Added: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-weld/src/main/java/org/apache/myfaces/extension/scripting/weld/startup/StartupExtension.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-weld/src/main/java/org/apache/myfaces/extension/scripting/weld/startup/StartupExtension.java?rev=1406130&view=auto
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-weld/src/main/java/org/apache/myfaces/extension/scripting/weld/startup/StartupExtension.java (added)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-weld/src/main/java/org/apache/myfaces/extension/scripting/weld/startup/StartupExtension.java Tue Nov 6 13:32:16 2012
@@ -0,0 +1,63 @@
+/*
+ * 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.myfaces.extension.scripting.weld.startup;
+
+import org.apache.myfaces.extension.scripting.weld.core.CDIThrowAwayClassloader;
+
+import javax.enterprise.event.Observes;
+import javax.enterprise.inject.spi.AfterBeanDiscovery;
+import javax.enterprise.inject.spi.AfterDeploymentValidation;
+import javax.enterprise.inject.spi.BeforeBeanDiscovery;
+import javax.enterprise.inject.spi.Extension;
+
+/**
+ * @author Werner Punz (latest modification by $Author$)
+ * @version $Revision$ $Date$
+ * <p/>
+ * An extension for cdi which does the initial lifecycle
+ * trigger from CDI instead of JSF since CDI is enabled
+ * before JSF we have to do it that way
+ * <p/>
+ * Stage 1 of our startup cycle
+ */
+public class StartupExtension implements Extension
+{
+ static ThreadLocal<ClassLoader> _classLoaderHolder = new ThreadLocal<ClassLoader>();
+
+ void beforeBeanDiscovery(@Observes BeforeBeanDiscovery bbd)
+ {
+ //We have to trigger our initial lifecycle with
+ //the compile runs but not with the daemon thread
+ //after that we can load the classes
+ //by temporarily plugging in our throw away classloader
+ _classLoaderHolder.set(Thread.currentThread().getContextClassLoader());
+ Thread.currentThread().setContextClassLoader(new CDIThrowAwayClassloader(Thread.currentThread().getContextClassLoader()));
+ }
+
+ void afterBeanDiscovery(@Observes AfterBeanDiscovery abd)
+ {
+ //here we unplug our temporary classloader
+ }
+
+ void afterDeploymentValidation(@Observes AfterDeploymentValidation abv)
+ {
+ Thread.currentThread().setContextClassLoader(_classLoaderHolder.get());
+ }
+}
Added: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-weld/src/main/java/org/apache/myfaces/extension/scripting/weld/startup/WeldBootstrapListener.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-weld/src/main/java/org/apache/myfaces/extension/scripting/weld/startup/WeldBootstrapListener.java?rev=1406130&view=auto
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-weld/src/main/java/org/apache/myfaces/extension/scripting/weld/startup/WeldBootstrapListener.java (added)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-weld/src/main/java/org/apache/myfaces/extension/scripting/weld/startup/WeldBootstrapListener.java Tue Nov 6 13:32:16 2012
@@ -0,0 +1,109 @@
+/*
+ * 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.myfaces.extension.scripting.weld.startup;
+
+import org.apache.commons.io.FileUtils;
+import org.apache.myfaces.extension.scripting.weld.core.CDIThrowAwayClassloader;
+import org.apache.myfaces.extension.scripting.weld.core.ReloadingListener;
+import org.apache.myfaces.extensions.scripting.core.api.WeavingContext;
+import org.apache.myfaces.extensions.scripting.jsf.startup.StartupServletContextPluginChainLoader;
+import org.jboss.weld.environment.Container;
+import org.jboss.weld.bootstrap.api.Bootstrap;
+import org.jboss.weld.servlet.api.ServletListener;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletContextEvent;
+import java.io.File;
+import java.io.IOException;
+import java.lang.reflect.Field;
+
+/**
+ * @author Werner Punz (latest modification by $Author$)
+ * @version $Revision$ $Date$
+ * <p/>
+ * This class unfortunately has to be copied over from Weld with minor modifications
+ * the reason for it is that the bootstrap instance var is private final transient
+ * but we have to reroute it to our own bootstrapper.
+ */
+
+public class WeldBootstrapListener extends org.jboss.weld.environment.servlet.Listener
+{
+
+ public static final String RELOADING_LISTENER = "ReloadingListener";
+ public static final String WELD_CONTAINER = "WeldContainer";
+ public static final String WELD_BOOTSTRAP = "Bootstrap";
+ public static final String WELD_LISTENER = "WeldListener";
+ private static final String FIELD_CONTAINER = "container";
+ private static final String FIELD_BOOTSTRAP = "bootstrap";
+ private static final String FIELD_WELD_LISTENER1 = "weldListener";
+
+ /**
+ * we initialize ext-script here
+ * in conjunction with the
+ *
+ * @param servletContext
+ */
+ private void initExtScript(ServletContext servletContext)
+ {
+ try
+ {
+ //the reloading listener also is the marker to avoid double initialisation
+ //after the container is kickstarted
+ if (servletContext.getAttribute(RELOADING_LISTENER) == null)
+ {
+ StartupServletContextPluginChainLoader.startup(servletContext);
+ servletContext.setAttribute(RELOADING_LISTENER, new ReloadingListener());
+ WeavingContext.getInstance().addListener((ReloadingListener) servletContext.getAttribute(RELOADING_LISTENER));
+ File target = WeavingContext.getInstance().getConfiguration().getCompileTarget("/META-INF/beans.xml");
+
+ //we generate a beans.xml for weld, owb seems to be able to cope without it
+ String beansXML = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
+ "<beans xmlns=\"http://java.sun.com/xml/ns/javaee\"\n" +
+ " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
+ " xsi:schemaLocation=\"http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd\">\n" +
+ "</beans>";
+ FileUtils.writeStringToFile(target, beansXML);
+
+ }
+ //we have to set a classloader here, because otherwise the bean discovery
+ //would fail, weld uses a different method than owb for the discovery
+
+ Thread.currentThread().setContextClassLoader(new CDIThrowAwayClassloader(Thread.currentThread().getContextClassLoader()));
+ }
+ catch (IOException e)
+ {
+ e.printStackTrace();
+ }
+ }
+
+ @Override
+ public void contextInitialized(ServletContextEvent sce)
+ {
+ ClassLoader loader = Thread.currentThread().getContextClassLoader();
+ //we initialize ext-scripting here we replace the classloader
+ //because weld scans the archives from a resource list
+ initExtScript(sce.getServletContext());
+ super.contextInitialized(sce);
+ //now that weld is initialized we reset the classloader for myfaces init
+ Thread.currentThread().setContextClassLoader(loader);
+ //we now fetch the container and whatever we have
+ }
+
+}
Added: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-weld/src/main/resources/META-INF/beans.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-weld/src/main/resources/META-INF/beans.xml?rev=1406130&view=auto
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-weld/src/main/resources/META-INF/beans.xml (added)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-weld/src/main/resources/META-INF/beans.xml Tue Nov 6 13:32:16 2012
@@ -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.
+-->
+<beans xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
+</beans>
\ No newline at end of file
Added: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-weld/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-weld/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension?rev=1406130&view=auto
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-weld/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension (added)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-weld/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension Tue Nov 6 13:32:16 2012
@@ -0,0 +1,20 @@
+#####################################################################################
+# 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.
+#####################################################################################
+
+org.apache.myfaces.extension.scripting.weld.startup.StartupExtension
\ No newline at end of file
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/pom.xml?rev=1406130&r1=1406129&r2=1406130&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/pom.xml (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/pom.xml Tue Nov 6 13:32:16 2012
@@ -44,6 +44,8 @@
<module>extscript-core</module>
<module>extscript-cdi</module>
<module>extscript-spring</module>
+ <module>extscript-weld</module>
+
<!--
<module>extscript-myfaces12-extensions</module>
<module>extscript-myfaces2-extensions</module>
Modified: myfaces/extensions/scripting/trunk/extscript-examples/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-examples/pom.xml?rev=1406130&r1=1406129&r2=1406130&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-examples/pom.xml (original)
+++ myfaces/extensions/scripting/trunk/extscript-examples/pom.xml Tue Nov 6 13:32:16 2012
@@ -93,6 +93,7 @@
<module>blog-example</module>
<module>cdi-example</module>
<module>spring-example</module>
+ <module>weld-example</module>
<!--
<module>spring-example</module>
-->
Added: myfaces/extensions/scripting/trunk/extscript-examples/weld-example/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-examples/weld-example/pom.xml?rev=1406130&view=auto
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-examples/weld-example/pom.xml (added)
+++ myfaces/extensions/scripting/trunk/extscript-examples/weld-example/pom.xml Tue Nov 6 13:32:16 2012
@@ -0,0 +1,135 @@
+<?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.
+-->
+<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">
+
+ <parent>
+ <artifactId>extscript-examples</artifactId>
+ <groupId>org.apache.myfaces.extensions.scripting</groupId>
+ <version>1.0.5-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.myfaces.extensions.scripting</groupId>
+ <artifactId>myfaces21-extscript-weld-example</artifactId>
+ <packaging>war</packaging>
+ <name>A simple project for MyFaces 2.1 and Ext-Scripting 1.0 and Weld</name>
+ <version>1.0.5-SNAPSHOT</version>
+ <url>http://www.apache.org</url>
+ <dependencies>
+ <!--
+ optional Groovy include,
+ if we leave it out, Groovy support is disabled
+ and only java support will work
+ -->
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-all</artifactId>
+ <version>${groovy.version}</version>
+ </dependency>
+
+ <!--
+ Note this is the only dependency we need
+ for ext-scripting, the include is a so called
+ meta bundle, which includes the entire
+ ext-scripting core+java6 support + myfaces 2 support
+ -->
+
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <version>${myfaces2.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ <version>${myfaces2.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.myfaces.extensions.scripting</groupId>
+ <artifactId>extscript-myfaces20-bundle</artifactId>
+ <version>1.0.5-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.myfaces.extensions.scripting</groupId>
+ <artifactId>extscript-weld</artifactId>
+ <version>1.0.5-SNAPSHOT</version>
+ </dependency>
+ <!-- weld dependencies -->
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-api</artifactId>
+ <version>1.1.Final</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.weld.servlet</groupId>
+ <artifactId>weld-servlet</artifactId>
+ <version>1.1.10.Final</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-atinject_1.0_spec</artifactId>
+ <version>1.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-interceptor_1.1_spec</artifactId>
+ <version>1.0</version>
+ <!--scope>runtime</scope -->
+ </dependency>
+ <!-- apache compatible jta spec replacement jar -->
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
+ <version>1.1.1</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <!-- deltaspike apis -->
+ <!--
+ <dependency>
+ <groupId>org.apache.deltaspike.core</groupId>
+ <artifactId>deltaspike-core-api</artifactId>
+ <version>0.4-incubating-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.deltaspike.core</groupId>
+ <artifactId>deltaspike-core-impl</artifactId>
+ <version>0.4-incubating-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.deltaspike.cdictrl</groupId>
+ <artifactId>deltaspike-cdictrl-api</artifactId>
+ <version>0.4-incubating-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.deltaspike.cdictrl</groupId>
+ <artifactId>deltaspike-cdictrl-weld</artifactId>
+ <version>0.4-incubating-SNAPSHOT</version>
+ </dependency>
+ -->
+ </dependencies>
+</project>
\ No newline at end of file
Added: myfaces/extensions/scripting/trunk/extscript-examples/weld-example/src/main/resources/META-INF/LICENSE.TXT
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-examples/weld-example/src/main/resources/META-INF/LICENSE.TXT?rev=1406130&view=auto
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-examples/weld-example/src/main/resources/META-INF/LICENSE.TXT (added)
+++ myfaces/extensions/scripting/trunk/extscript-examples/weld-example/src/main/resources/META-INF/LICENSE.TXT Tue Nov 6 13:32:16 2012
@@ -0,0 +1,174 @@
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
Added: myfaces/extensions/scripting/trunk/extscript-examples/weld-example/src/main/resources/META-INF/NOTICE.TXT
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-examples/weld-example/src/main/resources/META-INF/NOTICE.TXT?rev=1406130&view=auto
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-examples/weld-example/src/main/resources/META-INF/NOTICE.TXT (added)
+++ myfaces/extensions/scripting/trunk/extscript-examples/weld-example/src/main/resources/META-INF/NOTICE.TXT Tue Nov 6 13:32:16 2012
@@ -0,0 +1,17 @@
+This product includes software developed by:
+The Apache Software Foundation (http://www.apache.org/).
+
+------------------------------------------------------------------------
+See the file LICENSE.txt
+See licenses for accompanying products in the "/licenses" subdirectory.
+------------------------------------------------------------------------
+
+This software also includes code from Facelets (https://facelets.dev.java.net/)
+for the purpose of making components and facelet artifacts reloadable from
+other source directories.
+
+This product also includes the ASM bytecode library (http://asm.ow2.org/) for the purpose of
+dependency bytecode scanning.
+
+This product also includes the Groovy runtime http://groovy.codehaus.org/ library (ASL2 license) in binary form as well as
+the Scala http://www.scala-lang.org/ runtime in binary form.
Added: myfaces/extensions/scripting/trunk/extscript-examples/weld-example/src/main/resources/META-INF/beans.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-examples/weld-example/src/main/resources/META-INF/beans.xml?rev=1406130&view=auto
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-examples/weld-example/src/main/resources/META-INF/beans.xml (added)
+++ myfaces/extensions/scripting/trunk/extscript-examples/weld-example/src/main/resources/META-INF/beans.xml Tue Nov 6 13:32:16 2012
@@ -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.
+-->
+<beans xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
+</beans>
Added: myfaces/extensions/scripting/trunk/extscript-examples/weld-example/src/main/resources/META-INF/licenses/asm-license.txt
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-examples/weld-example/src/main/resources/META-INF/licenses/asm-license.txt?rev=1406130&view=auto
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-examples/weld-example/src/main/resources/META-INF/licenses/asm-license.txt (added)
+++ myfaces/extensions/scripting/trunk/extscript-examples/weld-example/src/main/resources/META-INF/licenses/asm-license.txt Tue Nov 6 13:32:16 2012
@@ -0,0 +1,29 @@
+Copyright (c) 2000-2011 INRIA, France Telecom
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holders nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
Added: myfaces/extensions/scripting/trunk/extscript-examples/weld-example/src/main/resources/META-INF/licenses/facelets-license.txt
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-examples/weld-example/src/main/resources/META-INF/licenses/facelets-license.txt?rev=1406130&view=auto
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-examples/weld-example/src/main/resources/META-INF/licenses/facelets-license.txt (added)
+++ myfaces/extensions/scripting/trunk/extscript-examples/weld-example/src/main/resources/META-INF/licenses/facelets-license.txt Tue Nov 6 13:32:16 2012
@@ -0,0 +1,70 @@
+Apache License, Version 2.0
+
+Apache License
+Version 2.0, January 2004
+http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.
+
+"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
+
+"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
+
+"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.
+
+"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
+
+"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.
+
+"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).
+
+"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
+
+"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."
+
+"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.
+
+2. Grant of Copyright License.
+
+Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License.
+
+Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.
+
+4. Redistribution.
+
+You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:
+
+ 1. You must give any other recipients of the Work or Derivative Works a copy of this License; and
+ 2. You must cause any modified files to carry prominent notices stating that You changed the files; and
+ 3. You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and
+ 4. If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License.
+
+You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
+
+5. Submission of Contributions.
+
+Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.
+
+6. Trademarks.
+
+This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty.
+
+Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability.
+
+In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability.
+
+While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
Added: myfaces/extensions/scripting/trunk/extscript-examples/weld-example/src/main/resources/META-INF/licenses/scala-license.txt
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-examples/weld-example/src/main/resources/META-INF/licenses/scala-license.txt?rev=1406130&view=auto
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-examples/weld-example/src/main/resources/META-INF/licenses/scala-license.txt (added)
+++ myfaces/extensions/scripting/trunk/extscript-examples/weld-example/src/main/resources/META-INF/licenses/scala-license.txt Tue Nov 6 13:32:16 2012
@@ -0,0 +1,35 @@
+SCALA LICENSE
+
+Copyright (c) 2002-2012 EPFL, Lausanne, unless otherwise specified.
+All rights reserved.
+
+This software was developed by the Programming Methods Laboratory of the
+Swiss Federal Institute of Technology (EPFL), Lausanne, Switzerland.
+
+Permission to use, copy, modify, and distribute this software in source
+or binary form for any purpose with or without fee is hereby granted,
+provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+ 3. Neither the name of the EPFL nor the names of its contributors
+ may be used to endorse or promote products derived from this
+ software without specific prior written permission.
+
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
\ No newline at end of file
Added: myfaces/extensions/scripting/trunk/extscript-examples/weld-example/src/main/webapp/META-INF/context.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-examples/weld-example/src/main/webapp/META-INF/context.xml?rev=1406130&view=auto
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-examples/weld-example/src/main/webapp/META-INF/context.xml (added)
+++ myfaces/extensions/scripting/trunk/extscript-examples/weld-example/src/main/webapp/META-INF/context.xml Tue Nov 6 13:32:16 2012
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Context>
+</Context>
\ No newline at end of file