You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by we...@apache.org on 2012/10/25 09:24:10 UTC
svn commit: r1401994 - in /myfaces/extensions/scripting/trunk:
extscript-core-root/extscript-spring/src/main/java/org/apache/myfaces/extensions/scripting/spring/bean/
extscript-core-root/extscript-spring/src/main/java/org/apache/myfaces/extensions/scri...
Author: werpu
Date: Thu Oct 25 07:24:10 2012
New Revision: 1401994
URL: http://svn.apache.org/viewvc?rev=1401994&view=rev
Log:
EXTSCRIPT-44: Adding missing author flags, adding license headers,
removing an unused listener for the system.
Removed:
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-spring/src/main/java/org/apache/myfaces/extensions/scripting/spring/bean/RefreshableBeanFactory.java
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-spring/src/main/java/org/apache/myfaces/extensions/scripting/spring/bean/SpringWeavingContext.java
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-spring/src/main/java/org/apache/myfaces/extensions/scripting/spring/context/ReloadingListener.java
Modified:
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-spring/src/main/java/org/apache/myfaces/extensions/scripting/spring/bean/CompilationAwareRefreshableBeanFactory.java
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-spring/src/main/java/org/apache/myfaces/extensions/scripting/spring/bean/RefreshableBeanAttribute.java
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-spring/src/main/java/org/apache/myfaces/extensions/scripting/spring/bean/support/CompilationAwareInstantiationStrategy.java
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-spring/src/main/java/org/apache/myfaces/extensions/scripting/spring/bean/support/CompilationAwareScopedProxyFactoryBean.java
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-spring/src/main/java/org/apache/myfaces/extensions/scripting/spring/context/CompilationAwareContextLoader.java
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-spring/src/main/java/org/apache/myfaces/extensions/scripting/spring/context/CompilationAwareXmlWebApplicationContext.java
myfaces/extensions/scripting/trunk/extscript-examples/spring-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/extension/scripting/spring/example/Greeter.java
myfaces/extensions/scripting/trunk/extscript-examples/spring-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/extension/scripting/spring/example/Person.java
myfaces/extensions/scripting/trunk/extscript-examples/spring-example/src/main/webapp/WEB-INF/spring-config.xml
myfaces/extensions/scripting/trunk/extscript-examples/spring-example/src/main/webapp/WEB-INF/web.xml
myfaces/extensions/scripting/trunk/extscript-examples/spring-example/src/main/webapp/index.jsp
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-spring/src/main/java/org/apache/myfaces/extensions/scripting/spring/bean/CompilationAwareRefreshableBeanFactory.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-spring/src/main/java/org/apache/myfaces/extensions/scripting/spring/bean/CompilationAwareRefreshableBeanFactory.java?rev=1401994&r1=1401993&r2=1401994&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-spring/src/main/java/org/apache/myfaces/extensions/scripting/spring/bean/CompilationAwareRefreshableBeanFactory.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-spring/src/main/java/org/apache/myfaces/extensions/scripting/spring/bean/CompilationAwareRefreshableBeanFactory.java Thu Oct 25 07:24:10 2012
@@ -42,6 +42,7 @@ import java.lang.reflect.Modifier;
/**
* @author Werner Punz (latest modification by $Author$)
+ * @author Bernhard Huemer
* @version $Revision$ $Date$
*/
@@ -233,7 +234,7 @@ public class CompilationAwareRefreshable
{
try
{
- //TODO outdated check here
+
Object value = invokeMethod(sourceDescriptor.getReadMethod(), source, new Object[0]);
if (value instanceof ThrowAwayClassloader)
{
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-spring/src/main/java/org/apache/myfaces/extensions/scripting/spring/bean/RefreshableBeanAttribute.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-spring/src/main/java/org/apache/myfaces/extensions/scripting/spring/bean/RefreshableBeanAttribute.java?rev=1401994&r1=1401993&r2=1401994&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-spring/src/main/java/org/apache/myfaces/extensions/scripting/spring/bean/RefreshableBeanAttribute.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-spring/src/main/java/org/apache/myfaces/extensions/scripting/spring/bean/RefreshableBeanAttribute.java Thu Oct 25 07:24:10 2012
@@ -27,6 +27,8 @@ import org.springframework.core.Conventi
* whether a bean definition has to be refreshed or not. Note that this attribute, however, is
* only capable of determining whether a bean definition has to be refreshed, sometimes you'll
* actually have to refresh bean instances as well.</p>
+ *
+ * @author Bernhard Huemer
*/
public class RefreshableBeanAttribute
{
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-spring/src/main/java/org/apache/myfaces/extensions/scripting/spring/bean/support/CompilationAwareInstantiationStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-spring/src/main/java/org/apache/myfaces/extensions/scripting/spring/bean/support/CompilationAwareInstantiationStrategy.java?rev=1401994&r1=1401993&r2=1401994&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-spring/src/main/java/org/apache/myfaces/extensions/scripting/spring/bean/support/CompilationAwareInstantiationStrategy.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-spring/src/main/java/org/apache/myfaces/extensions/scripting/spring/bean/support/CompilationAwareInstantiationStrategy.java Thu Oct 25 07:24:10 2012
@@ -46,6 +46,7 @@ import java.lang.reflect.Method;
* both the constructor / factory method to use and the according resolved arguments. However,
* this will most probably cause problems.
* </p>
+ * @author Bernhard Huemer (latest modification by $Author$)
*/
public class CompilationAwareInstantiationStrategy extends CglibSubclassingInstantiationStrategy
{
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-spring/src/main/java/org/apache/myfaces/extensions/scripting/spring/bean/support/CompilationAwareScopedProxyFactoryBean.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-spring/src/main/java/org/apache/myfaces/extensions/scripting/spring/bean/support/CompilationAwareScopedProxyFactoryBean.java?rev=1401994&r1=1401993&r2=1401994&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-spring/src/main/java/org/apache/myfaces/extensions/scripting/spring/bean/support/CompilationAwareScopedProxyFactoryBean.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-spring/src/main/java/org/apache/myfaces/extensions/scripting/spring/bean/support/CompilationAwareScopedProxyFactoryBean.java Thu Oct 25 07:24:10 2012
@@ -37,6 +37,7 @@ import java.lang.reflect.Modifier;
/**
* @author Werner Punz (latest modification by $Author$)
+ * @author Bernhard Huemer
* @version $Revision$ $Date$
*/
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-spring/src/main/java/org/apache/myfaces/extensions/scripting/spring/context/CompilationAwareContextLoader.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-spring/src/main/java/org/apache/myfaces/extensions/scripting/spring/context/CompilationAwareContextLoader.java?rev=1401994&r1=1401993&r2=1401994&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-spring/src/main/java/org/apache/myfaces/extensions/scripting/spring/context/CompilationAwareContextLoader.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-spring/src/main/java/org/apache/myfaces/extensions/scripting/spring/context/CompilationAwareContextLoader.java Thu Oct 25 07:24:10 2012
@@ -38,7 +38,7 @@ import java.io.IOException;
public class CompilationAwareContextLoader extends ContextLoader
{
- private static final String RELOADING_LISTENER = "ReloadingListener";
+ private static final String INITIALIZED = "CompilationAwareContextLoaderInit";
@Override
protected WebApplicationContext createWebApplicationContext(
@@ -57,12 +57,11 @@ public class CompilationAwareContextLoad
{
//the reloading listener also is the marker to avoid double initialisation
//after the container is kickstarted
- if (servletContext.getAttribute(RELOADING_LISTENER) == null)
+ if (servletContext.getAttribute(INITIALIZED) == null)
{
//probably already started
StartupServletContextPluginChainLoader.startup(servletContext);
- servletContext.setAttribute(RELOADING_LISTENER, new ReloadingListener());
- WeavingContext.getInstance().addListener((ReloadingListener) servletContext.getAttribute(RELOADING_LISTENER));
+ servletContext.setAttribute(INITIALIZED, Boolean.TRUE);
}
}
catch (IOException e)
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-spring/src/main/java/org/apache/myfaces/extensions/scripting/spring/context/CompilationAwareXmlWebApplicationContext.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-spring/src/main/java/org/apache/myfaces/extensions/scripting/spring/context/CompilationAwareXmlWebApplicationContext.java?rev=1401994&r1=1401993&r2=1401994&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-spring/src/main/java/org/apache/myfaces/extensions/scripting/spring/context/CompilationAwareXmlWebApplicationContext.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-spring/src/main/java/org/apache/myfaces/extensions/scripting/spring/context/CompilationAwareXmlWebApplicationContext.java Thu Oct 25 07:24:10 2012
@@ -25,6 +25,7 @@ import org.springframework.web.context.s
/**
* @author Werner Punz (latest modification by $Author$)
+ * @author Bernhard Huemer
* @version $Revision$ $Date$
*/
Modified: myfaces/extensions/scripting/trunk/extscript-examples/spring-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/extension/scripting/spring/example/Greeter.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-examples/spring-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/extension/scripting/spring/example/Greeter.java?rev=1401994&r1=1401993&r2=1401994&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-examples/spring-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/extension/scripting/spring/example/Greeter.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-examples/spring-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/extension/scripting/spring/example/Greeter.java Thu Oct 25 07:24:10 2012
@@ -20,7 +20,8 @@
package org.apache.myfaces.extension.scripting.spring.example;
/**
- *
+ * @author Bernhard Huemer
+ * @author Werner Punz
*/
public class Greeter
{
Modified: myfaces/extensions/scripting/trunk/extscript-examples/spring-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/extension/scripting/spring/example/Person.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-examples/spring-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/extension/scripting/spring/example/Person.java?rev=1401994&r1=1401993&r2=1401994&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-examples/spring-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/extension/scripting/spring/example/Person.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-examples/spring-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/extension/scripting/spring/example/Person.java Thu Oct 25 07:24:10 2012
@@ -19,6 +19,10 @@
package org.apache.myfaces.extension.scripting.spring.example;
+/**
+ * @author Bernhard Huemer
+ * @author Werner Punz
+ */
public class Person
{
Modified: myfaces/extensions/scripting/trunk/extscript-examples/spring-example/src/main/webapp/WEB-INF/spring-config.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-examples/spring-example/src/main/webapp/WEB-INF/spring-config.xml?rev=1401994&r1=1401993&r2=1401994&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-examples/spring-example/src/main/webapp/WEB-INF/spring-config.xml (original)
+++ myfaces/extensions/scripting/trunk/extscript-examples/spring-example/src/main/webapp/WEB-INF/spring-config.xml Thu Oct 25 07:24:10 2012
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
Modified: myfaces/extensions/scripting/trunk/extscript-examples/spring-example/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-examples/spring-example/src/main/webapp/WEB-INF/web.xml?rev=1401994&r1=1401993&r2=1401994&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-examples/spring-example/src/main/webapp/WEB-INF/web.xml (original)
+++ myfaces/extensions/scripting/trunk/extscript-examples/spring-example/src/main/webapp/WEB-INF/web.xml Thu Oct 25 07:24:10 2012
@@ -1,5 +1,4 @@
<?xml version="1.0"?>
-
<!--
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Modified: myfaces/extensions/scripting/trunk/extscript-examples/spring-example/src/main/webapp/index.jsp
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-examples/spring-example/src/main/webapp/index.jsp?rev=1401994&r1=1401993&r2=1401994&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-examples/spring-example/src/main/webapp/index.jsp (original)
+++ myfaces/extensions/scripting/trunk/extscript-examples/spring-example/src/main/webapp/index.jsp Thu Oct 25 07:24:10 2012
@@ -1,3 +1,21 @@
+<!--
+ * 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.
+-->
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%
response.sendRedirect("home.jsf");