removing the mojarra code for push
git-svn-id: https://svn.apache.org/repos/asf/myfaces/extensions/scripting/trunk@1414717 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/extscript-core-root/extscript-mojarra/pom.xml b/extscript-core-root/extscript-mojarra/pom.xml
deleted file mode 100644
index 331548e..0000000
--- a/extscript-core-root/extscript-mojarra/pom.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?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">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.myfaces.extensions.scripting</groupId>
- <artifactId>extscript-mojarra</artifactId>
- <version>1.0.5-SNAPSHOT</version>
- <packaging>jar</packaging>
- <name>MyFaces Extension Scripting Mojarra</name>
-
- <parent>
- <groupId>org.apache.myfaces.extensions.scripting</groupId>
- <artifactId>extscript-core-root</artifactId>
- <version>1.0.5-SNAPSHOT</version>
- </parent>
-
- <scm>
- <connection>
- scm:svn:http://svn.apache.org/repos/asf/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-mojarra
- </connection>
- <developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-mojarra
- </developerConnection>
- <url>http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-mojarra</url>
- </scm>
-
- <description>
- Mojarra specific adapters of the MyFaces extensions.scripting
- </description>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.myfaces.extensions.scripting</groupId>
- <artifactId>extscript-core</artifactId>
- <version>1.0.5-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>jsf</groupId>
- <artifactId>jsf</artifactId>
- <version>2.2-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
diff --git a/extscript-core-root/extscript-mojarra/readme.txt b/extscript-core-root/extscript-mojarra/readme.txt
deleted file mode 100644
index d5049c5..0000000
--- a/extscript-core-root/extscript-mojarra/readme.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Changes for mojarra
-a) We need a context listener for the startup plugin chainloader initialisation
-(just like we did it for owb)
-b) We need a servlet filter which sets throw away classloader as context classloader
-c) We need to write the adapter classes accordingly so that bean refreshes work in mojarra in conjunction with
-the ext-scripting api
-d) We need to externalize the myfaces adapter classes accordingly and move the call to a real Java SPI
-so that we can switch adapter implementations on the fly
-e) We need to move the entire facelet part into the myfaces submodule
-
diff --git a/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/scripting/jsf/facelet/ReroutingResourceResolver.java b/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/scripting/jsf/facelet/ReroutingResourceResolver.java
deleted file mode 100644
index 6481e2a..0000000
--- a/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/scripting/jsf/facelet/ReroutingResourceResolver.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * 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.extensions.scripting.jsf.facelet;
-
-import com.sun.faces.facelets.impl.DefaultResourceResolver;
-import org.apache.myfaces.extensions.scripting.core.api.WeavingContext;
-
-import javax.faces.application.ResourceHandler;
-import javax.faces.view.facelets.ResourceResolver;
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * @author Werner Punz (latest modification by $Author$)
- * @version $Revision$ $Date$
- */
-
-public class ReroutingResourceResolver extends ResourceResolver
-{
-
- DefaultResourceResolver _delegate = null;
- volatile boolean _initiated = false;
- List<String> _resourceDirs = null;
-
- Logger log = Logger.getLogger(this.getClass().getName());
-
- public ReroutingResourceResolver(ResourceResolver delegate)
- {
- super();
- //_delegate = new DefaultResourceResolver(resourceHandler);
- }
-
- @Override
- public URL resolveUrl(String path) {
-
- if (!_initiated) {
- _resourceDirs = WeavingContext.getInstance().getConfiguration().getResourceDirs();
- _initiated = true;
- }
-
- if (_resourceDirs != null && !_resourceDirs.isEmpty()) {
- for (String resourceDir : _resourceDirs) {
- File resource = new File(resourceDir + path);
- if (resource.exists()) try {
- return resource.toURI().toURL();
- } catch (MalformedURLException e) {
- log.log(Level.SEVERE, "",e);
- }
- }
- }
-
- return _delegate.resolveUrl(path);
- }
-}
diff --git a/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/scripting/jsf/facelet/TagHandlerDelegateFactoryImpl.java b/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/scripting/jsf/facelet/TagHandlerDelegateFactoryImpl.java
deleted file mode 100644
index aef9b8c..0000000
--- a/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/scripting/jsf/facelet/TagHandlerDelegateFactoryImpl.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * 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.extensions.scripting.jsf.facelet;
-
-import com.sun.faces.facelets.tag.jsf.BehaviorTagHandlerDelegateImpl;
-import com.sun.faces.facelets.tag.jsf.ConverterTagHandlerDelegateImpl;
-import com.sun.faces.facelets.tag.jsf.ValidatorTagHandlerDelegateImpl;
-import org.apache.myfaces.extensions.scripting.core.api.WeavingContext;
-import org.apache.myfaces.extensions.scripting.mojarra.facelet.ReloadingBehaviorTagHandlerDelegate;
-import org.apache.myfaces.extensions.scripting.mojarra.facelet.ReloadingComponentTagHandlerDelegate;
-import org.apache.myfaces.extensions.scripting.mojarra.facelet.ReloadingConverterTagHandlerDelegate;
-import org.apache.myfaces.extensions.scripting.mojarra.facelet.ReloadingValidatorTagHandlerDelegate;
-
-import javax.faces.view.facelets.BehaviorHandler;
-import javax.faces.view.facelets.ComponentHandler;
-import javax.faces.view.facelets.ConverterHandler;
-import javax.faces.view.facelets.TagHandlerDelegate;
-import javax.faces.view.facelets.TagHandlerDelegateFactory;
-import javax.faces.view.facelets.ValidatorHandler;
-
-/**
- * Tag handler delegate factory which injects reloading
- * proxies for our facelet artifacts
- */
-public class TagHandlerDelegateFactoryImpl extends TagHandlerDelegateFactory {
-
- @Override
- public TagHandlerDelegate createBehaviorHandlerDelegate(
- BehaviorHandler owner) {
- if (WeavingContext.getInstance().isDynamic(owner.getClass())) {
- return new ReloadingBehaviorTagHandlerDelegate(owner);
- } else {
- return new BehaviorTagHandlerDelegateImpl(owner);
- }
- }
-
- @Override
- public TagHandlerDelegate createComponentHandlerDelegate(
- ComponentHandler owner) {
- return new ReloadingComponentTagHandlerDelegate(owner);
- }
-
- @Override
- public TagHandlerDelegate createConverterHandlerDelegate(
- ConverterHandler owner) {
- if (WeavingContext.getInstance().isDynamic(owner.getClass())) {
- return new ReloadingConverterTagHandlerDelegate(owner);
- } else {
- return new ConverterTagHandlerDelegateImpl(owner);
- }
- }
-
- @Override
- public TagHandlerDelegate createValidatorHandlerDelegate(
- ValidatorHandler owner) {
- if (WeavingContext.getInstance().isDynamic(owner.getClass())) {
- return new ReloadingValidatorTagHandlerDelegate(owner);
- } else {
- return new ValidatorTagHandlerDelegateImpl(owner);
- }
- }
-}
-
diff --git a/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/scripting/mojarra/adapters/ClassLoaderServiceImpl.java b/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/scripting/mojarra/adapters/ClassLoaderServiceImpl.java
deleted file mode 100644
index 79588c2..0000000
--- a/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/scripting/mojarra/adapters/ClassLoaderServiceImpl.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * 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.extensions.scripting.mojarra.adapters;
-
-import org.apache.myfaces.extensions.scripting.core.api.ClassLoaderService;
-import org.apache.myfaces.extensions.scripting.core.common.util.ClassLoaderUtils;
-import org.apache.myfaces.extensions.scripting.core.engine.ThrowAwayClassloader;
-
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-
-/**
- * @author Werner Punz (latest modification by $Author$)
- * @version $Revision$ $Date$
- */
-
-public class ClassLoaderServiceImpl
- implements ClassLoaderService
-{
- static ClassLoader _oldClassLoader = null;
-
- @Override
- public void registerThrowAwayClassloader()
- {
- //we do not have the luxury of a pluggable classloading extensions like in myfaces
- // instead we have to provide our own classloader which is hooked in from time to time into the running system
- final ClassLoader loader = ClassLoaderUtils.getDefaultClassLoader();
- boolean found = false;
- ClassLoader parent = loader;
- while (parent != null && !found)
- {
- found = parent instanceof ThrowAwayClassloader;
- if (!found)
- {
- parent = parent.getParent();
- }
- }
- if (found)
- {
- return;
- }
- //in case of an unchanged classloader we can recycle our old throw away classloader
- if (_oldClassLoader != null && loader.equals(_oldClassLoader.getParent()))
- {
- Thread.currentThread().setContextClassLoader(_oldClassLoader);
- } else
- {
- _oldClassLoader = (ClassLoader) AccessController.doPrivileged(
- new PrivilegedAction()
- {
- public Object run()
- {
- return new ThrowAwayClassloader(loader);
- }
- });
- Thread.currentThread().setContextClassLoader(_oldClassLoader);
- }
- }
-
- @Override
- public int getPriority()
- {
- return 0; //default implementation, lowest priority
- }
-}
diff --git a/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/scripting/mojarra/adapters/MojarraSPI.java b/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/scripting/mojarra/adapters/MojarraSPI.java
deleted file mode 100644
index 93ee2e0..0000000
--- a/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/scripting/mojarra/adapters/MojarraSPI.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * 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.extensions.scripting.mojarra.adapters;
-
-import com.sun.faces.application.ApplicationAssociate;
-import com.sun.faces.mgbean.BeanBuilder;
-import com.sun.faces.mgbean.BeanManager;
-import com.sun.faces.mgbean.ManagedBeanInfo;
-import org.apache.myfaces.extensions.scripting.core.api.ImplementationService;
-import org.apache.myfaces.extensions.scripting.core.api.WeavingContext;
-import org.apache.myfaces.extensions.scripting.core.common.util.ClassLoaderUtils;
-import org.apache.myfaces.extensions.scripting.core.monitor.ClassResource;
-
-import javax.faces.context.FacesContext;
-import javax.servlet.ServletContext;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * @author Werner Punz (latest modification by $Author$)
- * @version $Revision$ $Date$
- */
-
-public class MojarraSPI implements ImplementationService
-{
- Logger logger = Logger.getLogger(this.getClass().getName());
-
- @Override
- public void registerClassloadingExtension(ServletContext context)
- {
- ClassLoaderUtils.getDefaultClassLoaderService().registerThrowAwayClassloader();
- /*ClassLoaderServiceImpl utils =
- ServiceLoader.load(ClassLoaderService.class)
- .iterator().next();
- utils.registerThrowAwayClassloader(); */
-
- }
-
- @Override
- public Class forName(String clazz)
- {
- try
- {
- return ClassLoaderUtils.getDefaultClassLoader().loadClass(clazz);
- }
- catch (ClassNotFoundException e)
- {
- logger.log(Level.SEVERE, e.getMessage());
- }
- return null;
- }
-
- @Override
- public void refreshManagedBeans()
- {
- //see the myfaces implementation of this mechanism
- if (FacesContext.getCurrentInstance() == null)
- {
- return;//no npe allowed
- }
-
- Collection<ClassResource> tainted = WeavingContext.getInstance().getTaintedClasses();
- Set<String> taints = new HashSet<String>();
- for (ClassResource taintedClass : tainted)
- {
- if (taintedClass.getAClass() != null)
- {
- taints.add(taintedClass.getAClass().getName());
- }
- }
-
- if (taints.size() > 0)
- {
- //We now have to check if the tainted classes belong to the managed beans
- Set<String> managedBeanClasses = new HashSet<String>();
- ServletContext context = (ServletContext) FacesContext.getCurrentInstance().getExternalContext().getContext();
- BeanManager manager = ApplicationAssociate.getInstance(context).getBeanManager();
- Map<String, BeanBuilder> registeredBeans = manager.getRegisteredBeans();
- List<ManagedBeanInfo> taintedBeans = new ArrayList<ManagedBeanInfo>(taints.size());
- for (Map.Entry<String, BeanBuilder> entry : registeredBeans.entrySet())
- {
- ManagedBeanInfo info = entry.getValue().getManagedBeanInfo();
- //bean found
- if (taints.contains(info.getClassName()))
- {
- taintedBeans.add(info);
- }
- }
-
- for (ManagedBeanInfo info : taintedBeans)
- {
- // String scope = info.getScope();
- //new interface which comes with mojarra 2.2.x
- manager.removeFromScope(info.getName(), FacesContext.getCurrentInstance());
- }
-
- }
- }
-
- //fix for mojarra
-
-}
diff --git a/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/scripting/mojarra/annotation/MojarraBeanImplementationListener.java b/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/scripting/mojarra/annotation/MojarraBeanImplementationListener.java
deleted file mode 100644
index 8dc8a54..0000000
--- a/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/scripting/mojarra/annotation/MojarraBeanImplementationListener.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * 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.extensions.scripting.mojarra.annotation;
-
-import com.sun.faces.application.ApplicationAssociate;
-import com.sun.faces.application.annotation.AnnotationManager;
-import org.apache.myfaces.extensions.scripting.core.api.AnnotationScanListener;
-import org.apache.myfaces.extensions.scripting.jsf.annotation.BaseAnnotationScanListener;
-
-import javax.faces.bean.ManagedBean;
-import javax.faces.context.FacesContext;
-import javax.servlet.ServletContext;
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- * @author Werner Punz (latest modification by $Author$)
- * @version $Revision$ $Date$
- */
-
-public class MojarraBeanImplementationListener extends BaseAnnotationScanListener implements AnnotationScanListener
-{
- public boolean supportsAnnotation(String annotation)
- {
- return annotation.equals(ManagedBean.class.getName());
- }
-
- public boolean supportsAnnotation(Class annotation)
- {
- return annotation.equals(ManagedBean.class);
- }
-
- public void register(Class clazz, java.lang.annotation.Annotation ann)
- {
-
- javax.faces.bean.ManagedBean annCasted = (javax.faces.bean.ManagedBean) ann;
-
- //we need to reregister for every bean due to possible managed prop
- //and scope changes
- ServletContext context = (ServletContext) FacesContext.getCurrentInstance().getExternalContext().getContext();
- AnnotationManager annotationManager = ApplicationAssociate.getInstance(context).getAnnotationManager();
-
- Set<Class> newType = new HashSet<Class>();
- newType.add(clazz);
- annotationManager.applyConfigAnnotations(FacesContext.getCurrentInstance(), ManagedBean.class, newType);
- }
-}
diff --git a/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/scripting/mojarra/facelet/ReloadingBehaviorTagHandlerDelegate.java b/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/scripting/mojarra/facelet/ReloadingBehaviorTagHandlerDelegate.java
deleted file mode 100644
index 8dd9d3f..0000000
--- a/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/scripting/mojarra/facelet/ReloadingBehaviorTagHandlerDelegate.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * 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.extensions.scripting.mojarra.facelet;
-
-import com.sun.faces.facelets.tag.jsf.BehaviorTagHandlerDelegateImpl;
-import org.apache.myfaces.extensions.scripting.core.api.ScriptingConst;
-import org.apache.myfaces.extensions.scripting.core.api.WeavingContext;
-
-import javax.faces.component.UIComponent;
-import javax.faces.view.facelets.BehaviorHandler;
-import javax.faces.view.facelets.FaceletContext;
-import javax.faces.view.facelets.MetaRuleset;
-import javax.faces.view.facelets.TagHandlerDelegate;
-import java.io.IOException;
-
-/**
- * Behavior Tag Handler which introduces reloading behavior
- *
- * @author Werner Punz (latest modification by $Author$)
- * @version $Revision$ $Date$
- */
-
-public class ReloadingBehaviorTagHandlerDelegate extends TagHandlerDelegate {
-
- BehaviorHandler _owner;
- TagHandlerDelegate _delegate;
-
- public ReloadingBehaviorTagHandlerDelegate(BehaviorHandler owner) {
- applyOwner(owner);
- }
-
- private void applyOwner(BehaviorHandler owner) {
- _owner = owner;
- _delegate = new BehaviorTagHandlerDelegateImpl(_owner);
- }
-
- @Override
- public void apply(FaceletContext ctx, UIComponent comp) throws IOException {
- if (WeavingContext.getInstance().isDynamic(_owner.getClass())) {
- BehaviorHandler newOwner = (BehaviorHandler) WeavingContext.getInstance().reload(_owner,
- ScriptingConst.ARTIFACT_TYPE_BEHAVIOR_HANDLER);
- if (!newOwner.getClass().equals(_owner.getClass())) {
- applyOwner(newOwner);
- }
- }
- _owner.apply(ctx, comp);
- }
-
- @Override
- public MetaRuleset createMetaRuleset(Class type) {
- return _delegate.createMetaRuleset(type);
- }
-
-}
diff --git a/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/scripting/mojarra/facelet/ReloadingComponentTagHandlerDelegate.java b/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/scripting/mojarra/facelet/ReloadingComponentTagHandlerDelegate.java
deleted file mode 100644
index 7f0ed79..0000000
--- a/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/scripting/mojarra/facelet/ReloadingComponentTagHandlerDelegate.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * 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.extensions.scripting.mojarra.facelet;
-
-import com.sun.faces.facelets.tag.jsf.ActionSourceRule;
-import com.sun.faces.facelets.tag.jsf.ComponentTagHandlerDelegateImpl;
-import com.sun.faces.facelets.tag.jsf.EditableValueHolderRule;
-import com.sun.faces.facelets.tag.jsf.ValueHolderRule;
-import org.apache.myfaces.extensions.scripting.core.api.ScriptingConst;
-import org.apache.myfaces.extensions.scripting.core.api.WeavingContext;
-import org.apache.myfaces.extensions.scripting.mojarra.facelet.support.ComponentRule;
-import org.apache.myfaces.extensions.scripting.mojarra.facelet.support.SwitchingMetarulesetImpl;
-
-import javax.faces.component.ActionSource;
-import javax.faces.component.EditableValueHolder;
-import javax.faces.component.UIComponent;
-import javax.faces.component.ValueHolder;
-import javax.faces.view.facelets.ComponentHandler;
-import javax.faces.view.facelets.FaceletContext;
-import javax.faces.view.facelets.MetaRuleset;
-import javax.faces.view.facelets.TagHandlerDelegate;
-import java.io.IOException;
-
-/**
- * we provide our own component tag handler factory impl
- * so that we can deal with refreshing of components
- * on Facelets level without running into
- * nasty type exceptions
- */
-public class ReloadingComponentTagHandlerDelegate extends TagHandlerDelegate {
-
- ComponentHandler _owner;
- TagHandlerDelegate _delegate;
-
- public ReloadingComponentTagHandlerDelegate(ComponentHandler owner) {
- applyOwner(owner);
- }
-
- private void applyOwner(ComponentHandler owner) {
- _owner = owner;
- _delegate = new ComponentTagHandlerDelegateImpl(_owner);
- }
-
- @Override
- public void apply(FaceletContext ctx, UIComponent comp) throws IOException {
- if (WeavingContext.getInstance().isDynamic(_owner.getClass())) {
- ComponentHandler newOwner = (ComponentHandler) WeavingContext.getInstance().reload(_owner,
- ScriptingConst.ARTIFACT_TYPE_COMPONENT_HANDLER);
- if (!newOwner.getClass().equals(_owner.getClass())) {
- applyOwner(newOwner);
- }
- }
- _delegate.apply(ctx, comp);
- }
-
- public MetaRuleset createMetaRuleset(Class type) {
- //We have to create a different meta rule set for dynamic classes
- //which have weaver instantiation criteria, the original meta rule set
- //first applies the attributes and then calls BeanPropertyTagRule
- //that one however caches the current method and does not take into consideration
- //that classes can be changed on the fly
-
- // if (WeavingContext.isDynamic(type)) {
- MetaRuleset m = new SwitchingMetarulesetImpl(_owner.getTag(), type);
- // ignore standard component attributes
- m.ignore("binding").ignore("id");
-
- // add auto wiring for attributes
- m.addRule(ComponentRule.Instance);
-
- // if it's an ActionSource
- if (ActionSource.class.isAssignableFrom(type)) {
- m.addRule(ActionSourceRule.Instance);
- }
-
- // if it's a ValueHolder
- if (ValueHolder.class.isAssignableFrom(type)) {
- m.addRule(ValueHolderRule.Instance);
-
- // if it's an EditableValueHolder
- if (EditableValueHolder.class.isAssignableFrom(type)) {
- m.ignore("submittedValue");
- m.ignore("valid");
- m.addRule(EditableValueHolderRule.Instance);
- }
- }
-
- return m;
- //}
-
- //return _delegate.createMetaRuleset(type);
- }
-}
diff --git a/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/scripting/mojarra/facelet/ReloadingConverterTagHandlerDelegate.java b/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/scripting/mojarra/facelet/ReloadingConverterTagHandlerDelegate.java
deleted file mode 100644
index 25d5173..0000000
--- a/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/scripting/mojarra/facelet/ReloadingConverterTagHandlerDelegate.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * 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.extensions.scripting.mojarra.facelet;
-
-import com.sun.faces.facelets.tag.jsf.ConverterTagHandlerDelegateImpl;
-import org.apache.myfaces.extensions.scripting.core.api.ScriptingConst;
-import org.apache.myfaces.extensions.scripting.core.api.WeavingContext;
-
-import javax.faces.component.UIComponent;
-import javax.faces.view.facelets.ConverterHandler;
-import javax.faces.view.facelets.FaceletContext;
-import javax.faces.view.facelets.MetaRuleset;
-import javax.faces.view.facelets.TagHandlerDelegate;
-import java.io.IOException;
-
-/**
- * @author Werner Punz (latest modification by $Author$)
- * @version $Revision$ $Date$
- */
-
-public class ReloadingConverterTagHandlerDelegate extends TagHandlerDelegate {
-
- ConverterHandler _owner;
- TagHandlerDelegate _delegate;
-
- public ReloadingConverterTagHandlerDelegate(ConverterHandler owner) {
- applyOwner(owner);
- }
-
- private void applyOwner(ConverterHandler owner) {
- _owner = owner;
- _delegate = new ConverterTagHandlerDelegateImpl(_owner);
- }
-
- @Override
- public void apply(FaceletContext ctx, UIComponent comp) throws IOException {
- if (WeavingContext.getInstance().isDynamic(_owner.getClass())) {
- ConverterHandler newOwner = (ConverterHandler) WeavingContext.getInstance().reload(_owner,
- ScriptingConst.ARTIFACT_TYPE_CONVERTER_HANDLER);
- if(!newOwner.getClass().equals(_owner.getClass())) {
- applyOwner(newOwner);
- }
- }
- _delegate.apply(ctx, comp);
- }
-
- @Override
- public MetaRuleset createMetaRuleset(Class type) {
- return _delegate.createMetaRuleset(type);
- }
-
-}
diff --git a/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/scripting/mojarra/facelet/ReloadingValidatorTagHandlerDelegate.java b/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/scripting/mojarra/facelet/ReloadingValidatorTagHandlerDelegate.java
deleted file mode 100644
index fc97364..0000000
--- a/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/scripting/mojarra/facelet/ReloadingValidatorTagHandlerDelegate.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * 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.extensions.scripting.mojarra.facelet;
-
-import com.sun.faces.facelets.tag.jsf.ValidatorTagHandlerDelegateImpl;
-import org.apache.myfaces.extensions.scripting.core.api.ScriptingConst;
-import org.apache.myfaces.extensions.scripting.core.api.WeavingContext;
-
-import javax.faces.component.UIComponent;
-import javax.faces.view.facelets.FaceletContext;
-import javax.faces.view.facelets.MetaRuleset;
-import javax.faces.view.facelets.TagHandlerDelegate;
-import javax.faces.view.facelets.ValidatorHandler;
-import java.io.IOException;
-
-/**
- * @author Werner Punz (latest modification by $Author$)
- * @version $Revision$ $Date$
- */
-
-public class ReloadingValidatorTagHandlerDelegate extends TagHandlerDelegate {
-
- ValidatorHandler _owner;
- TagHandlerDelegate _delegate;
-
- public ReloadingValidatorTagHandlerDelegate(ValidatorHandler owner) {
- applyOwner(owner);
- }
-
- private void applyOwner(ValidatorHandler owner) {
- _owner = owner;
- _delegate = new ValidatorTagHandlerDelegateImpl(_owner);
- }
-
- @Override
- public void apply(FaceletContext ctx, UIComponent comp) throws IOException {
- if (WeavingContext.getInstance().isDynamic(_owner.getClass())) {
- ValidatorHandler newOwner = (ValidatorHandler) WeavingContext.getInstance().reload(_owner,
- ScriptingConst.ARTIFACT_TYPE_VALIDATOR_HANDLER);
- if (!newOwner.getClass().equals(_owner.getClass())) {
- applyOwner(newOwner);
- }
- }
- _owner.apply(ctx, comp);
- }
-
- @Override
- public MetaRuleset createMetaRuleset(Class type) {
- return _delegate.createMetaRuleset(type);
- }
-}
diff --git a/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/scripting/mojarra/facelet/support/BeanPropertyTagRule.java b/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/scripting/mojarra/facelet/support/BeanPropertyTagRule.java
deleted file mode 100644
index 655512d..0000000
--- a/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/scripting/mojarra/facelet/support/BeanPropertyTagRule.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * 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.extensions.scripting.mojarra.facelet.support;
-
-import javax.faces.view.facelets.FaceletContext;
-import javax.faces.view.facelets.MetaRule;
-import javax.faces.view.facelets.Metadata;
-import javax.faces.view.facelets.MetadataTarget;
-import javax.faces.view.facelets.TagAttribute;
-import javax.faces.view.facelets.TagAttributeException;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-/**
- * @author Werner Punz (latest modification by $Author$)
- * @version $Revision$ $Date$
- */
-
-public final class BeanPropertyTagRule extends MetaRule
-{
- public final static BeanPropertyTagRule INSTANCE = new BeanPropertyTagRule();
-
- public Metadata applyRule(String name, TagAttribute attribute, MetadataTarget meta)
- {
- Method m = meta.getWriteMethod(name);
-
- // if the property is writable
- if (m != null)
- {
- if (attribute.isLiteral())
- {
- return new LiteralPropertyMetadata(m, attribute);
- }
- else
- {
- return new DynamicPropertyMetadata(m, attribute);
- }
- }
-
- return null;
- }
-
- final static class LiteralPropertyMetadata extends Metadata
- {
-
- private final Method method;
-
- private final TagAttribute attribute;
-
- private Object[] value;
-
- public LiteralPropertyMetadata(Method method, TagAttribute attribute)
- {
- this.method = method;
- this.attribute = attribute;
- }
-
- public void applyMetadata(FaceletContext ctx, Object instance)
- {
- if (value == null)
- {
- String str = this.attribute.getValue();
- value = new Object[] { ctx.getExpressionFactory().coerceToType(str, method.getParameterTypes()[0]) };
- }
- try
- {
- method.invoke(instance, this.value);
- }
- catch (InvocationTargetException e)
- {
- throw new TagAttributeException(this.attribute, e.getCause());
- }
- catch (Exception e)
- {
- throw new TagAttributeException(this.attribute, e);
- }
- }
-
- }
-
- final static class DynamicPropertyMetadata extends Metadata
- {
-
- private final Method method;
-
- private final TagAttribute attribute;
-
- private final Class<?> type;
-
- public DynamicPropertyMetadata(Method method, TagAttribute attribute)
- {
- this.method = method;
- this.type = method.getParameterTypes()[0];
- this.attribute = attribute;
- }
-
- public void applyMetadata(FaceletContext ctx, Object instance)
- {
- try
- {
- method.invoke(instance, new Object[] { attribute.getObject(ctx, type) });
- }
- catch (InvocationTargetException e)
- {
- throw new TagAttributeException(attribute, e.getCause());
- }
- catch (Exception e)
- {
- throw new TagAttributeException(attribute, e);
- }
- }
- }
-}
diff --git a/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/scripting/mojarra/facelet/support/ComponentRule.java b/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/scripting/mojarra/facelet/support/ComponentRule.java
deleted file mode 100644
index 7d34627..0000000
--- a/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/scripting/mojarra/facelet/support/ComponentRule.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * 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.extensions.scripting.mojarra.facelet.support;
-
-import javax.faces.component.UIComponent;
-import javax.faces.view.facelets.FaceletContext;
-import javax.faces.view.facelets.MetaRule;
-import javax.faces.view.facelets.Metadata;
-import javax.faces.view.facelets.MetadataTarget;
-import javax.faces.view.facelets.TagAttribute;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * we have to re implement the component rule class here
- * because it is declared private in the original
- * implementation
- */
-public final class ComponentRule extends MetaRule {
-
- final class LiteralAttributeMetadata extends Metadata {
- private final String _name;
- private final String _value;
-
- public LiteralAttributeMetadata(String name, String value) {
- _name = name;
- _value = value;
- }
-
- public void applyMetadata(FaceletContext ctx, Object instance) {
- ((UIComponent) instance).getAttributes().put(_name, _value);
- }
- }
-
- final static class ValueExpressionMetadata extends Metadata {
- private final String _name;
-
- private final TagAttribute _attr;
-
- private final Class<?> _type;
-
- public ValueExpressionMetadata(String name, Class<?> type, TagAttribute attr) {
- _name = name;
- _attr = attr;
- _type = type;
- }
-
- public void applyMetadata(FaceletContext ctx, Object instance) {
- ((UIComponent) instance).setValueExpression(_name, _attr.getValueExpression(ctx, _type));
- }
- }
-
- //private final static Logger log = Logger.getLogger("facelets.tag.component");
- private final static Logger log = Logger.getLogger(ComponentRule.class.getName());
-
- public final static ComponentRule Instance = new ComponentRule();
-
- public ComponentRule() {
- super();
- }
-
- public Metadata applyRule(String name, TagAttribute attribute, MetadataTarget meta) {
- if (meta.isTargetInstanceOf(UIComponent.class)) {
- // if component and dynamic, then must set expression
- if (!attribute.isLiteral()) {
- Class<?> type = meta.getPropertyType(name);
- if (type == null) {
- type = Object.class;
- }
-
- return new ValueExpressionMetadata(name, type, attribute);
- } else if (meta.getWriteMethod(name) == null) {
-
- // this was an attribute literal, but not property
- warnAttr(attribute, meta.getTargetClass(), name);
-
- return new LiteralAttributeMetadata(name, attribute.getValue());
- }
- }
- return null;
- }
-
- private static void warnAttr(TagAttribute attr, Class<?> type, String n) {
- if (log.isLoggable(Level.FINER)) {
- log.finer(attr + " Property '" + n + "' is not on type: " + type.getName());
- }
- }
-
-}
-
diff --git a/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/scripting/mojarra/facelet/support/InvokeDynamicBeanPropertyTagRule.java b/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/scripting/mojarra/facelet/support/InvokeDynamicBeanPropertyTagRule.java
deleted file mode 100644
index dcc7d7f..0000000
--- a/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/scripting/mojarra/facelet/support/InvokeDynamicBeanPropertyTagRule.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * 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.extensions.scripting.mojarra.facelet.support;
-
-
-import org.apache.myfaces.extensions.scripting.core.common.util.ReflectUtil;
-
-import javax.faces.view.facelets.FaceletContext;
-import javax.faces.view.facelets.Metadata;
-import javax.faces.view.facelets.MetadataTarget;
-import javax.faces.view.facelets.TagAttribute;
-import java.lang.reflect.Method;
-
-/**
- * We have to introduce a BeanPropertyTagRule
- * which calls the setter of a given component
- * on a weaker base than the original facelets component
- * property tag rule does.
- * By not enforcing a strict per object/class policy on calling
- * the setter we are able to reload the classes on the fly
- * <p/>
- * the original approach was to cache the classes, and then
- * call the invoke method on the existing class
- * if we now exchange the classes we have a problem...
- * By making the invocation of the method independend from the underlying
- * class (sort of calling an invokedynamic) we can bypass this problem
- * on facelets level.
- */
-public class InvokeDynamicBeanPropertyTagRule {
- public final static InvokeDynamicBeanPropertyTagRule Instance = new InvokeDynamicBeanPropertyTagRule();
-
- public Metadata applyRule(String name, TagAttribute attribute, MetadataTarget meta) {
- Method m = meta.getWriteMethod(name);
-
- // if the property is writable
- if (m != null) {
- if (attribute.isLiteral()) {
- return new LiteralPropertyMetadata(m, attribute);
- } else {
- return new DynamicPropertyMetadata(m, attribute);
- }
- }
-
- return null;
- }
-
- final static class LiteralPropertyMetadata extends Metadata {
-
- private final Method method;
-
- private final TagAttribute attribute;
-
- private Object[] value;
-
- public LiteralPropertyMetadata(Method method, TagAttribute attribute) {
- this.method = method;
- this.attribute = attribute;
- }
-
- public void applyMetadata(FaceletContext ctx, Object instance) {
- if (value == null) {
- String str = this.attribute.getValue();
- value = new Object[]{ctx.getExpressionFactory().coerceToType(str, method.getParameterTypes()[0])};
- }
- //What we do here is simply to call an invoke dynamic on the method with the same name
- //but on the new instance of, that way we can bypass class problems
- //because the method reference has stored the old class in our case
- ReflectUtil.executeMethod(instance, method.getName(), this.value);
- }
-
- }
-
- final static class DynamicPropertyMetadata extends Metadata {
-
- private final Method method;
-
- private final TagAttribute attribute;
-
- private final Class<?> type;
-
- public DynamicPropertyMetadata(Method method, TagAttribute attribute) {
- this.method = method;
- this.type = method.getParameterTypes()[0];
- this.attribute = attribute;
- }
-
- public void applyMetadata(FaceletContext ctx, Object instance) {
- ReflectUtil.executeMethod(instance, method.getName(), new Object[]{attribute.getObject(ctx, type)});
- }
- }
-}
diff --git a/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/scripting/mojarra/facelet/support/MetadataImpl.java b/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/scripting/mojarra/facelet/support/MetadataImpl.java
deleted file mode 100644
index cbea147..0000000
--- a/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/scripting/mojarra/facelet/support/MetadataImpl.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * 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.extensions.scripting.mojarra.facelet.support;
-
-import javax.faces.view.facelets.FaceletContext;
-import javax.faces.view.facelets.Metadata;
-
-/**
- * @author Werner Punz (latest modification by $Author$)
- * @version $Revision$ $Date$
- */
-
-public final class MetadataImpl extends Metadata
-{
- private final Metadata[] _mappers;
- private final int _size;
-
- public MetadataImpl(Metadata[] mappers)
- {
- _mappers = mappers;
- _size = mappers.length;
- }
-
- public void applyMetadata(FaceletContext ctx, Object instance)
- {
- // TODO: PROFILE - Check if saving the _size worth it or if an enhanced for is better
- for (int i = 0; i < _size; i++)
- {
- _mappers[i].applyMetadata(ctx, instance);
- }
- }
-}
diff --git a/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/scripting/mojarra/facelet/support/ParameterCheck.java b/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/scripting/mojarra/facelet/support/ParameterCheck.java
deleted file mode 100644
index 3dd88d5..0000000
--- a/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/scripting/mojarra/facelet/support/ParameterCheck.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * 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.extensions.scripting.mojarra.facelet.support;
-
-/**
- * @author Werner Punz (latest modification by $Author$)
- * @version $Revision$ $Date$
- */
-
-public class ParameterCheck
-{
- public final static void notNull(String name, Object value) throws NullPointerException
- {
- if (value == null)
- {
- throw new NullPointerException("Parameter '" + name + "' cannot be null");
- }
- }
-}
diff --git a/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/scripting/mojarra/facelet/support/SwitchingBeanPropertyTagRule.java b/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/scripting/mojarra/facelet/support/SwitchingBeanPropertyTagRule.java
deleted file mode 100644
index ac6ad41..0000000
--- a/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/scripting/mojarra/facelet/support/SwitchingBeanPropertyTagRule.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * 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.extensions.scripting.mojarra.facelet.support;
-
-import org.apache.myfaces.extensions.scripting.core.api.WeavingContext;
-
-import javax.faces.view.facelets.MetaRule;
-import javax.faces.view.facelets.Metadata;
-import javax.faces.view.facelets.MetadataTarget;
-import javax.faces.view.facelets.TagAttribute;
-
-/**
- * Bean property tag rule
- * which switches between the fast static
- * version and the slower invoke dynamic
- * version depending on the class type of
- * the incoming instance
- */
-public class SwitchingBeanPropertyTagRule extends MetaRule {
-
- InvokeDynamicBeanPropertyTagRule _invokeDynamic = InvokeDynamicBeanPropertyTagRule.Instance;
- BeanPropertyTagRule _invokeStatic = BeanPropertyTagRule.INSTANCE;
-
- public static volatile SwitchingBeanPropertyTagRule Instance = new SwitchingBeanPropertyTagRule();
-
- @Override
- public Metadata applyRule(String name, TagAttribute attribute, MetadataTarget meta) {
- if (WeavingContext.getInstance().isDynamic(meta.getTargetClass())) {
- return _invokeDynamic.applyRule(name, attribute, meta);
- } else {
- return _invokeStatic.applyRule(name, attribute, meta);
- }
- }
-}
diff --git a/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/scripting/mojarra/facelet/support/SwitchingMetarulesetImpl.java b/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/scripting/mojarra/facelet/support/SwitchingMetarulesetImpl.java
deleted file mode 100644
index 378c7d5..0000000
--- a/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/scripting/mojarra/facelet/support/SwitchingMetarulesetImpl.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- * 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.extensions.scripting.mojarra.facelet.support;
-
-
-import javax.faces.view.facelets.FaceletContext;
-import javax.faces.view.facelets.MetaRule;
-import javax.faces.view.facelets.MetaRuleset;
-import javax.faces.view.facelets.Metadata;
-import javax.faces.view.facelets.MetadataTarget;
-import javax.faces.view.facelets.Tag;
-import javax.faces.view.facelets.TagAttribute;
-import javax.faces.view.facelets.TagException;
-import java.beans.IntrospectionException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.WeakHashMap;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import com.sun.faces.facelets.tag.MetadataTargetImpl;
-
-
-/**
- * we have to to do a full reimplementation of the rule set
- * because otherwise we could not plant the switching bean reloading
- * rule due to private props in the original code
- */
-public class SwitchingMetarulesetImpl extends MetaRuleset {
- private final static Metadata NONE = new NullMetadata();
-
- //private final static Logger log = Logger.getLogger("facelets.tag.meta");
- private final static Logger log = Logger.getLogger(SwitchingMetarulesetImpl.class.getName());
-
- private final static WeakHashMap<String, MetadataTarget> _metadata = new WeakHashMap<String, MetadataTarget>();
-
- private final Map<String, TagAttribute> _attributes;
-
- private final List<Metadata> _mappers;
-
- private final List<MetaRule> _rules;
-
- private final Tag _tag;
-
- private final Class<?> _type;
-
-
-
-
- public SwitchingMetarulesetImpl(Tag tag, Class<?> type) {
- _tag = tag;
- _type = type;
- _attributes = new HashMap<String, TagAttribute>();
- _mappers = new ArrayList<Metadata>();
- _rules = new ArrayList<MetaRule>();
-
- // setup attributes
- for (TagAttribute attribute : _tag.getAttributes().getAll()) {
- _attributes.put(attribute.getLocalName(), attribute);
- }
-
- // add default rules
- _rules.add(SwitchingBeanPropertyTagRule.Instance);
- }
-
- public MetaRuleset add(Metadata mapper) {
- ParameterCheck.notNull("mapper", mapper);
-
- if (!_mappers.contains(mapper)) {
- _mappers.add(mapper);
- }
-
- return this;
- }
-
- public MetaRuleset addRule(MetaRule rule) {
- ParameterCheck.notNull("rule", rule);
-
- _rules.add(rule);
-
- return this;
- }
-
- public MetaRuleset alias(String attribute, String property) {
- ParameterCheck.notNull("attribute", attribute);
- ParameterCheck.notNull("property", property);
-
- TagAttribute attr = (TagAttribute) _attributes.remove(attribute);
- if (attr != null) {
- _attributes.put(property, attr);
- }
-
- return this;
- }
-
- public Metadata finish() {
- assert !_rules.isEmpty();
-
- if (!_attributes.isEmpty()) {
- MetadataTarget target = this._getMetadataTarget();
- int ruleEnd = _rules.size() - 1;
-
- // now iterate over attributes
- for (Map.Entry<String, TagAttribute> entry : _attributes.entrySet()) {
- Metadata data = null;
-
- int i = ruleEnd;
-
- // First loop is always safe
- do {
- MetaRule rule = _rules.get(i);
- data = rule.applyRule(entry.getKey(), entry.getValue(), target);
- i--;
- } while (data == null && i >= 0);
-
- if (data == null) {
- if (log.isLoggable(Level.SEVERE)) {
- log.severe(entry.getValue() + " Unhandled by MetaTagHandler for type " + _type.getName());
- }
- } else {
- _mappers.add(data);
- }
- }
- }
-
- if (_mappers.isEmpty()) {
- return NONE;
- } else {
- return new MetadataImpl(_mappers.toArray(new Metadata[_mappers.size()]));
- }
- }
-
- public MetaRuleset ignore(String attribute) {
- ParameterCheck.notNull("attribute", attribute);
-
- _attributes.remove(attribute);
-
- return this;
- }
-
- public MetaRuleset ignoreAll() {
- _attributes.clear();
-
- return this;
- }
-
- private final MetadataTarget _getMetadataTarget() {
- String key = _type.getName();
-
- MetadataTarget meta = _metadata.get(key);
- if (meta == null) {
- try {
- meta = new MetadataTargetImpl(_type);
- }
- catch (IntrospectionException e) {
- throw new TagException(_tag, "Error Creating TargetMetadata", e);
- }
-
- _metadata.put(key, meta);
- }
-
- return meta;
- }
-
- private static class NullMetadata extends Metadata {
- /**
- * {@inheritDoc}
- */
- @Override
- public void applyMetadata(FaceletContext ctx, Object instance) {
- // do nothing
- }
- }
-}
diff --git a/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/scripting/mojarra/servlet/ClassloaderSetupListener.java b/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/scripting/mojarra/servlet/ClassloaderSetupListener.java
deleted file mode 100644
index beccb15..0000000
--- a/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/scripting/mojarra/servlet/ClassloaderSetupListener.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * 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.extensions.scripting.mojarra.servlet;
-
-import org.apache.myfaces.extensions.scripting.core.api.ClassLoaderService;
-import org.apache.myfaces.extensions.scripting.core.common.util.ClassLoaderUtils;
-
-import javax.servlet.ServletRequestEvent;
-import javax.servlet.ServletRequestListener;
-import javax.servlet.annotation.WebListener;
-import java.util.ServiceLoader;
-
-/**
- * @author Werner Punz (latest modification by $Author$)
- * @version $Revision$ $Date$
- * <p/>
- * This servlet request listener plugs in our throw away classloader
- * which loads the compiled classes on the fly
- */
-@WebListener
-public class ClassloaderSetupListener implements ServletRequestListener
-{
- @Override
- public void requestDestroyed(ServletRequestEvent sre)
- {
- }
-
- @Override
- public void requestInitialized(ServletRequestEvent sre)
- {
- ClassLoaderUtils.getDefaultClassLoaderService().registerThrowAwayClassloader();
- /* ClassLoaderService utils =
- ServiceLoader.load(ClassLoaderService.class)
- .iterator().next();
- utils.registerThrowAwayClassloader(); */
- }
-}
diff --git a/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/scripting/mojarra/startup/StartupServletContextPluginChainloader.java b/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/scripting/mojarra/startup/StartupServletContextPluginChainloader.java
deleted file mode 100644
index adee53d..0000000
--- a/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/scripting/mojarra/startup/StartupServletContextPluginChainloader.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * 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.extensions.scripting.mojarra.startup;
-
-import com.sun.faces.config.startup.StartupListener;
-import org.apache.myfaces.extensions.scripting.jsf.startup.StartupServletContextPluginChainLoaderBase;
-
-import javax.faces.context.FacesContext;
-import javax.servlet.ServletContextEvent;
-
-/**
- * @author Werner Punz (latest modification by $Author$)
- * @version $Revision$ $Date$
- */
-
-public class StartupServletContextPluginChainloader implements StartupListener
-{
- StartupServletContextPluginChainLoaderBase _delegate = null;
-
- public StartupServletContextPluginChainloader()
- {
- _delegate = new StartupServletContextPluginChainLoaderBase();
- }
-
- public void preInit(ServletContextEvent evt)
- {
- _delegate.preInit(evt);
- FacesContext.getCurrentInstance().getExternalContext().getApplicationMap().put("com.sun.faces.dynamicContent",Boolean.TRUE);
- }
-
- public void postInit(ServletContextEvent evt)
- {
- _delegate.postInit(evt);
- }
-
- public void preDestroy(ServletContextEvent evt)
- {
- _delegate.preDestroy(evt);
- }
-
- public void postDestroy(ServletContextEvent evt)
- {
- _delegate.postDestroy(evt);
- }
-}
diff --git a/extscript-core-root/extscript-mojarra/src/main/resources/META-INF/LICENSE.TXT b/extscript-core-root/extscript-mojarra/src/main/resources/META-INF/LICENSE.TXT
deleted file mode 100644
index dd5b3a5..0000000
--- a/extscript-core-root/extscript-mojarra/src/main/resources/META-INF/LICENSE.TXT
+++ /dev/null
@@ -1,174 +0,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:
-
- (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.
diff --git a/extscript-core-root/extscript-mojarra/src/main/resources/META-INF/NOTICE.TXT b/extscript-core-root/extscript-mojarra/src/main/resources/META-INF/NOTICE.TXT
deleted file mode 100644
index a154ae7..0000000
--- a/extscript-core-root/extscript-mojarra/src/main/resources/META-INF/NOTICE.TXT
+++ /dev/null
@@ -1,14 +0,0 @@
-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.
diff --git a/extscript-core-root/extscript-mojarra/src/main/resources/META-INF/extscripting.taglib.xml b/extscript-core-root/extscript-mojarra/src/main/resources/META-INF/extscripting.taglib.xml
deleted file mode 100644
index fd45ab6..0000000
--- a/extscript-core-root/extscript-mojarra/src/main/resources/META-INF/extscripting.taglib.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?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.
--->
-<!--
-According to the spec we normally should divide between facelet 1.0 and facelet 2.0
-but since this seems to be a spec errata in the JSF 2.0 rev 0 spec and both implementations
-now pick up facelet 1.0 files as expected we centralize everything and keep everything on 1.2
-jsf level for now.
-Maybe in the long run we will divide both component classes into one for jsf 1.2 and
-one for jsf 2.0 but for now this approach is fine enough.
--->
-
-<!DOCTYPE facelet-taglib PUBLIC "-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN" "facelet-taglib_1_0.dtd">
-<facelet-taglib>
- <namespace>http://myfaces.apache.org/ext-scripting</namespace>
- <tag>
- <tag-name>compilerOutput</tag-name>
- <component>
- <component-type>org.apache.myfaces.extensions.scripting.components.CompilerComponent</component-type>
- <renderer-type>org.apache.myfaces.extensions.scripting.components.CompilerComponentRenderer</renderer-type>
- </component>
- </tag>
- <tag>
- <tag-name>taintHistory</tag-name>
- <component>
- <component-type>org.apache.myfaces.extensions.scripting.components.TaintHistory</component-type>
- <renderer-type>org.apache.myfaces.extensions.scripting.components.TaintHistoryRenderer</renderer-type>
- </component>
- </tag>
-</facelet-taglib>
diff --git a/extscript-core-root/extscript-mojarra/src/main/resources/META-INF/faces-config.xml b/extscript-core-root/extscript-mojarra/src/main/resources/META-INF/faces-config.xml
deleted file mode 100644
index 0d76043..0000000
--- a/extscript-core-root/extscript-mojarra/src/main/resources/META-INF/faces-config.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<faces-config 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/web-facesconfig_2_0.xsd"
- version="2.0">
-
-
- <!--
- * 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.
- -->
-
- <factory>
-
- <!--
- all these factories are replacements for the normal ones
- issue is we have to make a codeweaving for every bean created
- -->
-
- <application-factory>
- org.apache.myfaces.extensions.scripting.jsf.dynamicDecorators.factories.ScriptingApplicationFactory
- </application-factory>
-
- <faces-context-factory>
- org.apache.myfaces.extensions.scripting.jsf.dynamicDecorators.factories.ScriptingFacesContextFactory
- </faces-context-factory>
-
-
- <lifecycle-factory>
- org.apache.myfaces.extensions.scripting.jsf.dynamicDecorators.factories.ScriptingLifecycleFactory
- </lifecycle-factory>
-
- <render-kit-factory>
- org.apache.myfaces.extensions.scripting.jsf.dynamicDecorators.factories.ScriptingRenderkitFactory
- </render-kit-factory>
-
- <!--
- <tag-handler-delegate-factory>
- org.apache.myfaces.extensions.scripting.facelet.TagHandlerDelegateFactoryImpl
- </tag-handler-delegate-factory>
- -->
- </factory>
- <lifecycle>
- <phase-listener>org.apache.myfaces.extensions.scripting.jsf.startup.RefreshPhaseListener</phase-listener>
- </lifecycle>
-
-
- <!--
- <application>
- <system-event-listener>
- <system-event-listener-class>org.apache.myfaces.extensions.scripting.startup.IntialScanAnnotationListener
- </system-event-listener-class>
- <system-event-class>javax.faces.event.PostConstructApplicationEvent</system-event-class>
- </system-event-listener>
-
- </application>
- -->
-
- <component>
- <component-type>org.apache.myfaces.extensions.scripting.components.CompilerComponent</component-type>
- <component-class>org.apache.myfaces.extensions.scripting.jsf.components.CompilerComponent
- </component-class>
- </component>
-
- <component>
- <component-type>org.apache.myfaces.extensions.scripting.components.TaintHistory</component-type>
- <component-class>org.apache.myfaces.extensions.scripting.jsf.components.TaintHistory</component-class>
- </component>
- <render-kit>
- <renderer>
- <component-family>javax.faces.Output</component-family>
- <renderer-type>org.apache.myfaces.extensions.scripting.components.CompilerComponentRenderer</renderer-type>
- <renderer-class>org.apache.myfaces.extensions.scripting.jsf.components.CompilerComponentRenderer
- </renderer-class>
- </renderer>
- <renderer>
- <component-family>javax.faces.Output</component-family>
- <renderer-type>org.apache.myfaces.extensions.scripting.components.TaintHistoryRenderer</renderer-type>
- <renderer-class>org.apache.myfaces.extensions.scripting.jsf.components.TaintHistoryRenderer</renderer-class>
- </renderer>
- </render-kit>
- <!-- not working on this stage the user has to define it
- <application>
- <resource-handler>org.apache.myfaces.extensions.scripting.jsf.resources.SourceResourceHandler</resource-handler>
- </application>
- -->
-
-</faces-config>
\ No newline at end of file
diff --git a/extscript-core-root/extscript-mojarra/src/main/resources/META-INF/licenses/asm-license.txt b/extscript-core-root/extscript-mojarra/src/main/resources/META-INF/licenses/asm-license.txt
deleted file mode 100644
index 7676ba5..0000000
--- a/extscript-core-root/extscript-mojarra/src/main/resources/META-INF/licenses/asm-license.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-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
diff --git a/extscript-core-root/extscript-mojarra/src/main/resources/META-INF/licenses/facelets-license.txt b/extscript-core-root/extscript-mojarra/src/main/resources/META-INF/licenses/facelets-license.txt
deleted file mode 100644
index 959625a..0000000
--- a/extscript-core-root/extscript-mojarra/src/main/resources/META-INF/licenses/facelets-license.txt
+++ /dev/null
@@ -1,70 +0,0 @@
-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
diff --git a/extscript-core-root/extscript-mojarra/src/main/resources/META-INF/services/com.sun.faces.config.startup.StartupListener b/extscript-core-root/extscript-mojarra/src/main/resources/META-INF/services/com.sun.faces.config.startup.StartupListener
deleted file mode 100644
index be1c2fd..0000000
--- a/extscript-core-root/extscript-mojarra/src/main/resources/META-INF/services/com.sun.faces.config.startup.StartupListener
+++ /dev/null
@@ -1,19 +0,0 @@
-#####################################################################################
-# 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.extensions.scripting.mojarra.startup.StartupServletContextPluginChainloader
\ No newline at end of file
diff --git a/extscript-core-root/extscript-mojarra/src/main/resources/META-INF/services/org.apache.myfaces.extensions.scripting.core.api.AnnotationScanListener b/extscript-core-root/extscript-mojarra/src/main/resources/META-INF/services/org.apache.myfaces.extensions.scripting.core.api.AnnotationScanListener
deleted file mode 100644
index f2c21d9..0000000
--- a/extscript-core-root/extscript-mojarra/src/main/resources/META-INF/services/org.apache.myfaces.extensions.scripting.core.api.AnnotationScanListener
+++ /dev/null
@@ -1,19 +0,0 @@
-#####################################################################################
-# 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.extensions.scripting.mojarra.annotation.MojarraBeanImplementationListener
diff --git a/extscript-core-root/extscript-mojarra/src/main/resources/META-INF/services/org.apache.myfaces.extensions.scripting.core.api.ClassLoaderService b/extscript-core-root/extscript-mojarra/src/main/resources/META-INF/services/org.apache.myfaces.extensions.scripting.core.api.ClassLoaderService
deleted file mode 100644
index c15c684..0000000
--- a/extscript-core-root/extscript-mojarra/src/main/resources/META-INF/services/org.apache.myfaces.extensions.scripting.core.api.ClassLoaderService
+++ /dev/null
@@ -1 +0,0 @@
-org.apache.myfaces.extensions.scripting.mojarra.adapters.ClassLoaderServiceImpl
\ No newline at end of file
diff --git a/extscript-core-root/extscript-mojarra/src/main/resources/META-INF/services/org.apache.myfaces.extensions.scripting.core.api.ImplementationService b/extscript-core-root/extscript-mojarra/src/main/resources/META-INF/services/org.apache.myfaces.extensions.scripting.core.api.ImplementationService
deleted file mode 100644
index eeaf76e..0000000
--- a/extscript-core-root/extscript-mojarra/src/main/resources/META-INF/services/org.apache.myfaces.extensions.scripting.core.api.ImplementationService
+++ /dev/null
@@ -1 +0,0 @@
-org.apache.myfaces.extensions.scripting.mojarra.adapters.MojarraSPI
diff --git a/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/JavaTestRenderer1.java b/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/JavaTestRenderer1.java
index 74710cc..51e658f 100644
--- a/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/JavaTestRenderer1.java
+++ b/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/JavaTestRenderer1.java
@@ -40,7 +40,7 @@
static Logger log = Logger.getLogger(JavaTestRenderer1.class.getName());
- private static final String MSG2 = "Hello world from Renderer 1";
+ private static final String MSG2 = "Hello world from dynamic Renderer 1";
public void encodeBegin(FacesContext context, UIComponent component) throws IOException {
super.encodeBegin(context, component);
