click-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From take...@apache.org
Subject svn commit: r795917 - in /incubator/click/trunk/tools/eclipse/org.apache.click.eclipse: click-2.1.0/ spring-2.5.6/ spring-2.5.6/lib/ src/org/apache/click/eclipse/ src/org/apache/click/eclipse/core/facet/
Date Mon, 20 Jul 2009 16:57:12 GMT
Author: takezoe
Date: Mon Jul 20 16:57:12 2009
New Revision: 795917

URL: http://svn.apache.org/viewvc?rev=795917&view=rev
Log: (empty)

Added:
    incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/spring-2.5.6/lib/commons-logging-1.1.1.jar
  (with props)
Removed:
    incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/spring-2.5.6/lib/jstl-1.1.2.jar
    incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/spring-2.5.6/lib/spring-security-core-2.0.4.jar
    incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/spring-2.5.6/lib/standard-1.1.2.jar
Modified:
    incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.1.0/click.xml
    incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/spring-2.5.6/spring-beans.xml
    incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/src/org/apache/click/eclipse/ClickUtils.java
    incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/src/org/apache/click/eclipse/core/facet/ClickFacetInstallDelegate.java
    incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/src/org/apache/click/eclipse/core/facet/ClickFacetUtil.java

Modified: incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.1.0/click.xml
URL: http://svn.apache.org/viewvc/incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.1.0/click.xml?rev=795917&r1=795916&r2=795917&view=diff
==============================================================================
--- incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.1.0/click.xml (original)
+++ incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/click-2.1.0/click.xml Mon
Jul 20 16:57:12 2009
@@ -20,7 +20,7 @@
 
 <click-app charset="UTF-8">
 
-  <pages package="org.apache.click.examples.page" autobinding="annotation"/>
+  <pages package="${rootPackage}" autobinding="annotation"/>
 
   <mode value="profile"/>
 

Added: incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/spring-2.5.6/lib/commons-logging-1.1.1.jar
URL: http://svn.apache.org/viewvc/incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/spring-2.5.6/lib/commons-logging-1.1.1.jar?rev=795917&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/spring-2.5.6/lib/commons-logging-1.1.1.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/spring-2.5.6/spring-beans.xml
URL: http://svn.apache.org/viewvc/incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/spring-2.5.6/spring-beans.xml?rev=795917&r1=795916&r2=795917&view=diff
==============================================================================
--- incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/spring-2.5.6/spring-beans.xml
(original)
+++ incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/spring-2.5.6/spring-beans.xml
Mon Jul 20 16:57:12 2009
@@ -26,44 +26,6 @@
      http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd
      http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-2.0.4.xsd">
 
-    <context:component-scan base-package="org.apache.click.examples" scope-resolver="org.apache.click.extras.spring.PageScopeResolver"/>
-
-    <!-- Spring Security Setup -->
-
-    <http auto-config="true">
-        <!-- Uncomment the line below if you need login.htm to be accessed through HTTPS,
-             and ensure that HTTPS is enabled on the server. -->
-        <!--<intercept-url pattern="/springsecurity/login.htm" requires-channel="https"
/>-->
-
-        <!-- Access to pages under the /springsecurity/secure folder requires to be authenticated
-->
-        <intercept-url pattern='/springsecurity/secure/**' access='IS_AUTHENTICATED_REMEMBERED'/>
-
-        <!-- Specify the login page url, failure url and default landing page url. -->
-        <form-login login-page='/springsecurity/login.htm' authentication-failure-url="/springsecurity/login.htm?auth-error=1"
default-target-url="/"/>
-
-        <!-- Specify a virtual "logout" url which forwards to the logout.htm page. -->
-        <logout logout-url="/springsecurity/logout" logout-success-url="/springsecurity/logout.htm"/>
-    </http>
-
-    <beans:bean id="authenticationManager" class="org.springframework.security.providers.ProviderManager">
-        <beans:property name="providers">
-            <beans:list>
-                <beans:ref local="daoAuthenticationProvider" />
-            </beans:list>
-        </beans:property>
-    </beans:bean>
-
-    
-    <beans:bean id="daoAuthenticationProvider" class="org.springframework.security.providers.dao.DaoAuthenticationProvider">
-        <beans:property name="userDetailsService" ref="userDetailsService"/>
-    </beans:bean>
-
-    <!-- Specify a simple property based authentication provider. For production
-         systems switch to LDAP or JDBC based providers. -->
-
-    <authentication-provider user-service-ref='userDetailsService'/>
-
-	  <!-- This bean is optional; it isn't used by any other bean as it only listens and
logs -->
-    <beans:bean id="loggerListener" class="org.springframework.security.event.authentication.LoggerListener"
/>
+    <context:component-scan base-package="${rootPackage}" scope-resolver="org.apache.click.extras.spring.PageScopeResolver"/>
 
 </beans:beans>

Modified: incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/src/org/apache/click/eclipse/ClickUtils.java
URL: http://svn.apache.org/viewvc/incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/src/org/apache/click/eclipse/ClickUtils.java?rev=795917&r1=795916&r2=795917&view=diff
==============================================================================
--- incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/src/org/apache/click/eclipse/ClickUtils.java
(original)
+++ incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/src/org/apache/click/eclipse/ClickUtils.java
Mon Jul 20 16:57:12 2009
@@ -44,12 +44,8 @@
 import org.eclipse.jdt.core.JavaCore;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.text.IDocument;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.ParamValue;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
 import org.eclipse.jst.j2ee.internal.deployables.J2EEFlexProjDeployable;
 import org.eclipse.jst.j2ee.web.componentcore.util.WebArtifactEdit;
-import org.eclipse.jst.j2ee.webapplication.InitParam;
 import org.eclipse.jst.j2ee.webapplication.JSPType;
 import org.eclipse.jst.j2ee.webapplication.Servlet;
 import org.eclipse.jst.j2ee.webapplication.ServletMapping;
@@ -365,19 +361,19 @@
 			ServletType servletType = WebapplicationFactory.eINSTANCE.createServletType();
 			if(useSpring){
 				servletType.setClassName(CLICK_SPRING_SERVLET_CLASS);
-				if (webApp.getJ2EEVersionID() >= J2EEVersionConstants.J2EE_1_4_ID) {
-					// J2EE 1.4
-					ParamValue initParam = CommonFactory.eINSTANCE.createParamValue();
-					initParam.setName("spring-path");
-					initParam.setValue("/applicationContext.xml");
-					servlet.getInitParams().add(initParam);
-				} else {
-					// J2EE 1.2 or 1.3
-					InitParam initParam = WebapplicationFactory.eINSTANCE.createInitParam();
-					initParam.setParamName("spring-path");
-					initParam.setParamValue("/applicationContext.xml");
-					servlet.getParams().add(initParam);
-				}
+//				if (webApp.getJ2EEVersionID() >= J2EEVersionConstants.J2EE_1_4_ID) {
+//					// J2EE 1.4
+//					ParamValue initParam = CommonFactory.eINSTANCE.createParamValue();
+//					initParam.setName("spring-path");
+//					initParam.setValue("/applicationContext.xml");
+//					servlet.getInitParams().add(initParam);
+//				} else {
+//					// J2EE 1.2 or 1.3
+//					InitParam initParam = WebapplicationFactory.eINSTANCE.createInitParam();
+//					initParam.setParamName("spring-path");
+//					initParam.setParamValue("/applicationContext.xml");
+//					servlet.getParams().add(initParam);
+//				}
 			} else {
 				servletType.setClassName(CLICK_SERVLET_CLASS);
 			}

Modified: incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/src/org/apache/click/eclipse/core/facet/ClickFacetInstallDelegate.java
URL: http://svn.apache.org/viewvc/incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/src/org/apache/click/eclipse/core/facet/ClickFacetInstallDelegate.java?rev=795917&r1=795916&r2=795917&view=diff
==============================================================================
--- incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/src/org/apache/click/eclipse/core/facet/ClickFacetInstallDelegate.java
(original)
+++ incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/src/org/apache/click/eclipse/core/facet/ClickFacetInstallDelegate.java
Mon Jul 20 16:57:12 2009
@@ -38,10 +38,10 @@
 import org.eclipse.jdt.core.JavaCore;
 import org.eclipse.jdt.core.JavaModelException;
 import org.eclipse.jst.j2ee.common.CommonFactory;
+import org.eclipse.jst.j2ee.common.Listener;
 import org.eclipse.jst.j2ee.common.ParamValue;
 import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
 import org.eclipse.jst.j2ee.web.componentcore.util.WebArtifactEdit;
-import org.eclipse.jst.j2ee.webapplication.ContextParam;
 import org.eclipse.jst.j2ee.webapplication.Filter;
 import org.eclipse.jst.j2ee.webapplication.FilterMapping;
 import org.eclipse.jst.j2ee.webapplication.InitParam;
@@ -289,10 +289,14 @@
 			servlet = ClickUtils.createOrUpdateServletRef(webApp, config, servlet, useSpring);
 			
 			if(useSpring){
-				ContextParam contextParam = WebapplicationFactory.eINSTANCE.createContextParam();
-				contextParam.setParamName("contextConfigLocation");
-				contextParam.setParamValue("WEB-INF/spring-beans.xml");
+				ParamValue contextParam = CommonFactory.eINSTANCE.createParamValue();
+				contextParam.setName("contextConfigLocation");
+				contextParam.setValue("WEB-INF/spring-beans.xml");
 				webApp.getContextParams().add(contextParam);
+				
+				Listener listener = CommonFactory.eINSTANCE.createListener();
+				listener.setListenerClassName("org.springframework.web.context.ContextLoaderListener");
+				webApp.getListeners().add(listener);
 			}
 			
 			// Add PerformanceFilter

Modified: incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/src/org/apache/click/eclipse/core/facet/ClickFacetUtil.java
URL: http://svn.apache.org/viewvc/incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/src/org/apache/click/eclipse/core/facet/ClickFacetUtil.java?rev=795917&r1=795916&r2=795917&view=diff
==============================================================================
--- incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/src/org/apache/click/eclipse/core/facet/ClickFacetUtil.java
(original)
+++ incubator/click/trunk/tools/eclipse/org.apache.click.eclipse/src/org/apache/click/eclipse/core/facet/ClickFacetUtil.java
Mon Jul 20 16:57:12 2009
@@ -51,10 +51,8 @@
 	};
 
 	public static final String[] SPRING_LIBS = {
-		"/lib/jstl-1.1.2.jar",
 		"/lib/spring-2.5.6.jar",
-		"/lib/spring-security-core-2.0.4.jar",
-		"/lib/standard-1.1.2.jar",
+		"/lib/commons-logging-1.1.1.jar",
 	};
 
 	public static IPath getWebContentPath(IProject project) {



Mime
View raw message