Propchange:
struts/struts2/trunk/plugins/portlet/src/main/resources/struts-plugin.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/struts2/trunk/plugins/portlet/src/main/resources/struts-plugin.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified:
struts/struts2/trunk/plugins/portlet/src/test/java/org/apache/struts2/portlet/interceptor/PortletAwareInterceptorTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/portlet/src/test/java/org/apache/struts2/portlet/interceptor/PortletAwareInterceptorTest.java?rev=590812&r1=590811&r2=590812&view=diff
==============================================================================
---
struts/struts2/trunk/plugins/portlet/src/test/java/org/apache/struts2/portlet/interceptor/PortletAwareInterceptorTest.java
(original)
+++
struts/struts2/trunk/plugins/portlet/src/test/java/org/apache/struts2/portlet/interceptor/PortletAwareInterceptorTest.java
Wed Oct 31 13:32:54 2007
@@ -1,67 +1,67 @@
-/*
- * $Id: $
- *
- * 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.struts2.portlet.interceptor;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.portlet.PortletRequest;
-
-import junit.framework.TestCase;
-
-import org.apache.struts2.portlet.PortletActionConstants;
-import org.easymock.EasyMock;
-
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.ActionInvocation;
-
-public class PortletAwareInterceptorTest extends TestCase implements
PortletActionConstants {
-
- private PortletAwareInterceptor interceptor;
-
- protected void setUp() throws Exception {
- super.setUp();
- interceptor = new PortletAwareInterceptor();
- }
-
- protected void tearDown() throws Exception {
- super.tearDown();
- }
-
- public void testPortletRequestIsSet() throws Exception {
- PortletRequest request =
EasyMock.createMock(PortletRequest.class);
- Map<String, Object> ctx = new HashMap<String, Object>();
- ctx.put(REQUEST, request);
- PortletRequestAware action =
EasyMock.createMock(PortletRequestAware.class);
- action.setPortletRequest(request);
-
- ActionInvocation invocation =
EasyMock.createNiceMock(ActionInvocation.class);
-
EasyMock.expect(invocation.getInvocationContext()).andReturn(new
ActionContext(ctx));
- EasyMock.expect(invocation.getAction()).andReturn(action);
-
- EasyMock.replay(action);
- EasyMock.replay(invocation);
-
- interceptor.intercept(invocation);
-
- EasyMock.verify(action);
- }
-}
+/*
+ * $Id: $
+ *
+ * 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.struts2.portlet.interceptor;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.portlet.PortletRequest;
+
+import junit.framework.TestCase;
+
+import org.apache.struts2.portlet.PortletActionConstants;
+import org.easymock.EasyMock;
+
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.ActionInvocation;
+
+public class PortletAwareInterceptorTest extends TestCase implements
PortletActionConstants {
+
+ private PortletAwareInterceptor interceptor;
+
+ protected void setUp() throws Exception {
+ super.setUp();
+ interceptor = new PortletAwareInterceptor();
+ }
+
+ protected void tearDown() throws Exception {
+ super.tearDown();
+ }
+
+ public void testPortletRequestIsSet() throws Exception {
+ PortletRequest request =
EasyMock.createMock(PortletRequest.class);
+ Map<String, Object> ctx = new HashMap<String, Object>();
+ ctx.put(REQUEST, request);
+ PortletRequestAware action =
EasyMock.createMock(PortletRequestAware.class);
+ action.setPortletRequest(request);
+
+ ActionInvocation invocation =
EasyMock.createNiceMock(ActionInvocation.class);
+
EasyMock.expect(invocation.getInvocationContext()).andReturn(new
ActionContext(ctx));
+ EasyMock.expect(invocation.getAction()).andReturn(action);
+
+ EasyMock.replay(action);
+ EasyMock.replay(invocation);
+
+ interceptor.intercept(invocation);
+
+ EasyMock.verify(action);
+ }
+}
Propchange:
struts/struts2/trunk/plugins/portlet/src/test/java/org/apache/struts2/portlet/interceptor/PortletAwareInterceptorTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/struts2/trunk/plugins/portlet/src/test/java/org/apache/struts2/portlet/interceptor/PortletAwareInterceptorTest.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified:
struts/struts2/trunk/plugins/portlet/src/test/java/org/apache/struts2/portlet/interceptor/PortletStateInterceptorTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/portlet/src/test/java/org/apache/struts2/portlet/interceptor/PortletStateInterceptorTest.java?rev=590812&r1=590811&r2=590812&view=diff
==============================================================================
---
struts/struts2/trunk/plugins/portlet/src/test/java/org/apache/struts2/portlet/interceptor/PortletStateInterceptorTest.java
(original)
+++
struts/struts2/trunk/plugins/portlet/src/test/java/org/apache/struts2/portlet/interceptor/PortletStateInterceptorTest.java
Wed Oct 31 13:32:54 2007
@@ -1,159 +1,159 @@
-/*
- * $Id: $
- *
- * 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.struts2.portlet.interceptor;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.portlet.ActionResponse;
-import javax.portlet.RenderRequest;
-
-import junit.framework.TestCase;
-
-import org.apache.struts2.StrutsTestCase;
-import org.apache.struts2.dispatcher.DefaultActionSupport;
-import org.apache.struts2.portlet.PortletActionConstants;
-import org.apache.struts2.portlet.dispatcher.DirectRenderFromEventAction;
-import org.easymock.EasyMock;
-
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.ActionInvocation;
-import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.util.ValueStackFactory;
-
-public class PortletStateInterceptorTest extends StrutsTestCase implements
PortletActionConstants {
-
- private PortletStateInterceptor interceptor;
-
- public void setUp() throws Exception {
- super.setUp();
- interceptor = new PortletStateInterceptor();
- }
-
- public void testCopyValueStackFromEventToRenderPhase() throws Exception
{
- ActionResponse actionResponse =
EasyMock.createNiceMock(ActionResponse.class);
- ActionInvocation invocation =
EasyMock.createNiceMock(ActionInvocation.class);
-
- Map<String, Object> ctxMap = new HashMap<String, Object>();
- ctxMap.put(PHASE, EVENT_PHASE);
- ctxMap.put(RESPONSE, actionResponse);
- Map<String, Object> session = new HashMap<String, Object>();
-
- ActionContext ctx = new ActionContext(ctxMap);
- ctx.setSession(session);
-
EasyMock.expect(invocation.getInvocationContext()).andStubReturn(ctx);
- actionResponse.setRenderParameter(EVENT_ACTION, "true");
-
- ValueStack stack =
container.getInstance(ValueStackFactory.class).createValueStack();
- EasyMock.expect(invocation.getStack()).andStubReturn(stack);
-
- EasyMock.replay(actionResponse);
- EasyMock.replay(invocation);
-
- interceptor.intercept(invocation);
-
- EasyMock.verify(actionResponse);
- EasyMock.verify(invocation);
-
- assertSame(stack, session.get(STACK_FROM_EVENT_PHASE));
-
- }
-
- public void testDoNotRestoreValueStackInRenderPhaseWhenProperPrg()
throws Exception {
- RenderRequest renderRequest =
EasyMock.createNiceMock(RenderRequest.class);
- ActionInvocation invocation =
EasyMock.createNiceMock(ActionInvocation.class);
-
-
- ValueStack eventPhaseStack =
container.getInstance(ValueStackFactory.class).createValueStack();
- eventPhaseStack.set("testKey", "testValue");
-
- ValueStack currentStack =
container.getInstance(ValueStackFactory.class).createValueStack();
- currentStack.set("anotherTestKey", "anotherTestValue");
-
- Map<String, Object> ctxMap = new HashMap<String, Object>();
- Map<String, Object> session = new HashMap<String, Object>();
-
- session.put(STACK_FROM_EVENT_PHASE, eventPhaseStack);
-
- ctxMap.put(PHASE, RENDER_PHASE);
- ctxMap.put(REQUEST, renderRequest);
-
- ActionContext ctx = new ActionContext(ctxMap);
- ctx.setSession(session);
-
-
EasyMock.expect(invocation.getInvocationContext()).andStubReturn(ctx);
-
EasyMock.expect(invocation.getStack()).andStubReturn(currentStack);
- EasyMock.expect(invocation.getAction()).andStubReturn(new
DefaultActionSupport());
-
EasyMock.expect(renderRequest.getParameter(EVENT_ACTION)).andStubReturn("true");
-
- EasyMock.replay(renderRequest);
- EasyMock.replay(invocation);
-
- interceptor.intercept(invocation);
-
- ValueStack resultingStack = invocation.getStack();
-
- assertNull(resultingStack.findValue("testKey"));
- assertEquals("anotherTestValue",
resultingStack.findValue("anotherTestKey"));
-
-
- }
-
- public void testRestoreValueStackInRenderPhaseWhenNotProperPrg() throws
Exception {
- RenderRequest renderRequest =
EasyMock.createNiceMock(RenderRequest.class);
- ActionInvocation invocation =
EasyMock.createNiceMock(ActionInvocation.class);
-
- ValueStack eventPhaseStack =
container.getInstance(ValueStackFactory.class).createValueStack();
- eventPhaseStack.set("testKey", "testValue");
-
- ValueStack currentStack =
container.getInstance(ValueStackFactory.class).createValueStack();
- currentStack.set("anotherTestKey", "anotherTestValue");
-
-
EasyMock.expect(invocation.getStack()).andStubReturn(currentStack);
-
- Map<String, Object> ctxMap = new HashMap<String, Object>();
- Map<String, Object> session = new HashMap<String, Object>();
-
- session.put(STACK_FROM_EVENT_PHASE, eventPhaseStack);
-
- ctxMap.put(PHASE, RENDER_PHASE);
- ctxMap.put(REQUEST, renderRequest);
-
- ActionContext ctx = new ActionContext(ctxMap);
- ctx.setSession(session);
-
-
EasyMock.expect(invocation.getInvocationContext()).andStubReturn(ctx);
-
EasyMock.expect(invocation.getStack()).andStubReturn(currentStack);
- EasyMock.expect(invocation.getAction()).andStubReturn(new
DirectRenderFromEventAction());
-
EasyMock.expect(renderRequest.getParameter(EVENT_ACTION)).andStubReturn("true");
-
- EasyMock.replay(renderRequest);
- EasyMock.replay(invocation);
-
- interceptor.intercept(invocation);
-
- ValueStack resultingStack = invocation.getStack();
- assertEquals("testValue", resultingStack.findValue("testKey"));
- assertEquals("anotherTestValue",
resultingStack.findValue("anotherTestKey"));
-
-
- }
-}
+/*
+ * $Id: $
+ *
+ * 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.struts2.portlet.interceptor;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.portlet.ActionResponse;
+import javax.portlet.RenderRequest;
+
+import junit.framework.TestCase;
+
+import org.apache.struts2.StrutsTestCase;
+import org.apache.struts2.dispatcher.DefaultActionSupport;
+import org.apache.struts2.portlet.PortletActionConstants;
+import org.apache.struts2.portlet.dispatcher.DirectRenderFromEventAction;
+import org.easymock.EasyMock;
+
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.util.ValueStackFactory;
+
+public class PortletStateInterceptorTest extends StrutsTestCase implements
PortletActionConstants {
+
+ private PortletStateInterceptor interceptor;
+
+ public void setUp() throws Exception {
+ super.setUp();
+ interceptor = new PortletStateInterceptor();
+ }
+
+ public void testCopyValueStackFromEventToRenderPhase() throws Exception
{
+ ActionResponse actionResponse =
EasyMock.createNiceMock(ActionResponse.class);
+ ActionInvocation invocation =
EasyMock.createNiceMock(ActionInvocation.class);
+
+ Map<String, Object> ctxMap = new HashMap<String, Object>();
+ ctxMap.put(PHASE, EVENT_PHASE);
+ ctxMap.put(RESPONSE, actionResponse);
+ Map<String, Object> session = new HashMap<String, Object>();
+
+ ActionContext ctx = new ActionContext(ctxMap);
+ ctx.setSession(session);
+
EasyMock.expect(invocation.getInvocationContext()).andStubReturn(ctx);
+ actionResponse.setRenderParameter(EVENT_ACTION, "true");
+
+ ValueStack stack =
container.getInstance(ValueStackFactory.class).createValueStack();
+ EasyMock.expect(invocation.getStack()).andStubReturn(stack);
+
+ EasyMock.replay(actionResponse);
+ EasyMock.replay(invocation);
+
+ interceptor.intercept(invocation);
+
+ EasyMock.verify(actionResponse);
+ EasyMock.verify(invocation);
+
+ assertSame(stack, session.get(STACK_FROM_EVENT_PHASE));
+
+ }
+
+ public void testDoNotRestoreValueStackInRenderPhaseWhenProperPrg()
throws Exception {
+ RenderRequest renderRequest =
EasyMock.createNiceMock(RenderRequest.class);
+ ActionInvocation invocation =
EasyMock.createNiceMock(ActionInvocation.class);
+
+
+ ValueStack eventPhaseStack =
container.getInstance(ValueStackFactory.class).createValueStack();
+ eventPhaseStack.set("testKey", "testValue");
+
+ ValueStack currentStack =
container.getInstance(ValueStackFactory.class).createValueStack();
+ currentStack.set("anotherTestKey", "anotherTestValue");
+
+ Map<String, Object> ctxMap = new HashMap<String, Object>();
+ Map<String, Object> session = new HashMap<String, Object>();
+
+ session.put(STACK_FROM_EVENT_PHASE, eventPhaseStack);
+
+ ctxMap.put(PHASE, RENDER_PHASE);
+ ctxMap.put(REQUEST, renderRequest);
+
+ ActionContext ctx = new ActionContext(ctxMap);
+ ctx.setSession(session);
+
+
EasyMock.expect(invocation.getInvocationContext()).andStubReturn(ctx);
+
EasyMock.expect(invocation.getStack()).andStubReturn(currentStack);
+ EasyMock.expect(invocation.getAction()).andStubReturn(new
DefaultActionSupport());
+
EasyMock.expect(renderRequest.getParameter(EVENT_ACTION)).andStubReturn("true");
+
+ EasyMock.replay(renderRequest);
+ EasyMock.replay(invocation);
+
+ interceptor.intercept(invocation);
+
+ ValueStack resultingStack = invocation.getStack();
+
+ assertNull(resultingStack.findValue("testKey"));
+ assertEquals("anotherTestValue",
resultingStack.findValue("anotherTestKey"));
+
+
+ }
+
+ public void testRestoreValueStackInRenderPhaseWhenNotProperPrg() throws
Exception {
+ RenderRequest renderRequest =
EasyMock.createNiceMock(RenderRequest.class);
+ ActionInvocation invocation =
EasyMock.createNiceMock(ActionInvocation.class);
+
+ ValueStack eventPhaseStack =
container.getInstance(ValueStackFactory.class).createValueStack();
+ eventPhaseStack.set("testKey", "testValue");
+
+ ValueStack currentStack =
container.getInstance(ValueStackFactory.class).createValueStack();
+ currentStack.set("anotherTestKey", "anotherTestValue");
+
+
EasyMock.expect(invocation.getStack()).andStubReturn(currentStack);
+
+ Map<String, Object> ctxMap = new HashMap<String, Object>();
+ Map<String, Object> session = new HashMap<String, Object>();
+
+ session.put(STACK_FROM_EVENT_PHASE, eventPhaseStack);
+
+ ctxMap.put(PHASE, RENDER_PHASE);
+ ctxMap.put(REQUEST, renderRequest);
+
+ ActionContext ctx = new ActionContext(ctxMap);
+ ctx.setSession(session);
+
+
EasyMock.expect(invocation.getInvocationContext()).andStubReturn(ctx);
+
EasyMock.expect(invocation.getStack()).andStubReturn(currentStack);
+ EasyMock.expect(invocation.getAction()).andStubReturn(new
DirectRenderFromEventAction());
+
EasyMock.expect(renderRequest.getParameter(EVENT_ACTION)).andStubReturn("true");
+
+ EasyMock.replay(renderRequest);
+ EasyMock.replay(invocation);
+
+ interceptor.intercept(invocation);
+
+ ValueStack resultingStack = invocation.getStack();
+ assertEquals("testValue", resultingStack.findValue("testKey"));
+ assertEquals("anotherTestValue",
resultingStack.findValue("anotherTestKey"));
+
+
+ }
+}
Propchange:
struts/struts2/trunk/plugins/portlet/src/test/java/org/apache/struts2/portlet/interceptor/PortletStateInterceptorTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/struts2/trunk/plugins/portlet/src/test/java/org/apache/struts2/portlet/interceptor/PortletStateInterceptorTest.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange:
struts/struts2/trunk/plugins/sitegraph/src/main/resources/org/apache/struts2/sitegraph/sitegraph-usage.txt
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange:
struts/struts2/trunk/plugins/sitegraph/src/test/resources/org/apache/struts2/sitegraph/out.txt
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified:
struts/struts2/trunk/plugins/sitegraph/src/test/resources/org/apache/struts2/sitegraph/tutorial/sitegraph/guess-error.ftl
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/sitegraph/src/test/resources/org/apache/struts2/sitegraph/tutorial/sitegraph/guess-error.ftl?rev=590812&r1=590811&r2=590812&view=diff
==============================================================================
---
struts/struts2/trunk/plugins/sitegraph/src/test/resources/org/apache/struts2/sitegraph/tutorial/sitegraph/guess-error.ftl
(original)
+++
struts/struts2/trunk/plugins/sitegraph/src/test/resources/org/apache/struts2/sitegraph/tutorial/sitegraph/guess-error.ftl
Wed Oct 31 13:32:54 2007
@@ -1,6 +1,6 @@
<#--
/*
- * $Id: pom.xml 559206 2007-07-24 21:01:18Z apetrelli $
+ * $Id$
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Propchange:
struts/struts2/trunk/plugins/sitegraph/src/test/resources/org/apache/struts2/sitegraph/tutorial/sitegraph/guess-error.ftl
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified:
struts/struts2/trunk/plugins/sitegraph/src/test/resources/org/apache/struts2/sitegraph/tutorial/sitegraph/guess-input.ftl
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/sitegraph/src/test/resources/org/apache/struts2/sitegraph/tutorial/sitegraph/guess-input.ftl?rev=590812&r1=590811&r2=590812&view=diff
==============================================================================
---
struts/struts2/trunk/plugins/sitegraph/src/test/resources/org/apache/struts2/sitegraph/tutorial/sitegraph/guess-input.ftl
(original)
+++
struts/struts2/trunk/plugins/sitegraph/src/test/resources/org/apache/struts2/sitegraph/tutorial/sitegraph/guess-input.ftl
Wed Oct 31 13:32:54 2007
@@ -1,6 +1,6 @@
<#--
/*
- * $Id: pom.xml 559206 2007-07-24 21:01:18Z apetrelli $
+ * $Id$
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Propchange:
struts/struts2/trunk/plugins/sitegraph/src/test/resources/org/apache/struts2/sitegraph/tutorial/sitegraph/guess-input.ftl
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified:
struts/struts2/trunk/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/NoneDecoratorMapper.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/NoneDecoratorMapper.java?rev=590812&r1=590811&r2=590812&view=diff
==============================================================================
---
struts/struts2/trunk/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/NoneDecoratorMapper.java
(original)
+++
struts/struts2/trunk/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/NoneDecoratorMapper.java
Wed Oct 31 13:32:54 2007
@@ -1,5 +1,5 @@
/*
- * $Id: FreeMarkerPageFilter.java 475637 2006-11-16 08:32:03Z mrdon $
+ * $Id$
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Propchange:
struts/struts2/trunk/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/NoneDecoratorMapper.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/struts2/trunk/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/NoneDecoratorMapper.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified:
struts/struts2/trunk/plugins/sitemesh/src/main/resources/struts-plugin.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/sitemesh/src/main/resources/struts-plugin.xml?rev=590812&r1=590811&r2=590812&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/sitemesh/src/main/resources/struts-plugin.xml
(original)
+++ struts/struts2/trunk/plugins/sitemesh/src/main/resources/struts-plugin.xml
Wed Oct 31 13:32:54 2007
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!--
/*
- * $Id: pom.xml 559206 2007-07-24 21:01:18Z apetrelli $
+ * $Id$
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Propchange:
struts/struts2/trunk/plugins/sitemesh/src/main/resources/struts-plugin.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/struts2/trunk/plugins/sitemesh/src/main/resources/struts-plugin.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified:
struts/struts2/trunk/plugins/spring/src/main/resources/struts-plugin.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/spring/src/main/resources/struts-plugin.xml?rev=590812&r1=590811&r2=590812&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/spring/src/main/resources/struts-plugin.xml
(original)
+++ struts/struts2/trunk/plugins/spring/src/main/resources/struts-plugin.xml
Wed Oct 31 13:32:54 2007
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!--
/*
- * $Id: pom.xml 559206 2007-07-24 21:01:18Z apetrelli $
+ * $Id$
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Propchange:
struts/struts2/trunk/plugins/spring/src/main/resources/struts-plugin.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/struts2/trunk/plugins/spring/src/main/resources/struts-plugin.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified:
struts/struts2/trunk/plugins/struts1/src/main/resources/struts-plugin.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/struts1/src/main/resources/struts-plugin.xml?rev=590812&r1=590811&r2=590812&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/struts1/src/main/resources/struts-plugin.xml
(original)
+++ struts/struts2/trunk/plugins/struts1/src/main/resources/struts-plugin.xml
Wed Oct 31 13:32:54 2007
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!--
/*
- * $Id: pom.xml 559206 2007-07-24 21:01:18Z apetrelli $
+ * $Id$
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Propchange:
struts/struts2/trunk/plugins/struts1/src/main/resources/struts-plugin.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/struts2/trunk/plugins/struts1/src/main/resources/struts-plugin.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified:
struts/struts2/trunk/plugins/struts1/src/test/resources/org/apache/struts2/s1/test-struts-factory.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/struts1/src/test/resources/org/apache/struts2/s1/test-struts-factory.xml?rev=590812&r1=590811&r2=590812&view=diff
==============================================================================
---
struts/struts2/trunk/plugins/struts1/src/test/resources/org/apache/struts2/s1/test-struts-factory.xml
(original)
+++
struts/struts2/trunk/plugins/struts1/src/test/resources/org/apache/struts2/s1/test-struts-factory.xml
Wed Oct 31 13:32:54 2007
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!--
/*
- * $Id: pom.xml 559206 2007-07-24 21:01:18Z apetrelli $
+ * $Id$
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Propchange:
struts/struts2/trunk/plugins/struts1/src/test/resources/org/apache/struts2/s1/test-struts-factory.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified:
struts/struts2/trunk/plugins/tiles/src/main/resources/struts-plugin.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/tiles/src/main/resources/struts-plugin.xml?rev=590812&r1=590811&r2=590812&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/tiles/src/main/resources/struts-plugin.xml
(original)
+++ struts/struts2/trunk/plugins/tiles/src/main/resources/struts-plugin.xml Wed
Oct 31 13:32:54 2007
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!--
/*
- * $Id: pom.xml 559206 2007-07-24 21:01:18Z apetrelli $
+ * $Id$
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Propchange:
struts/struts2/trunk/plugins/tiles/src/main/resources/struts-plugin.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/struts2/trunk/plugins/tiles/src/main/resources/struts-plugin.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: struts/struts2/trunk/src/main/idea/project.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/src/main/idea/project.xml?rev=590812&r1=590811&r2=590812&view=diff
==============================================================================
--- struts/struts2/trunk/src/main/idea/project.xml (original)
+++ struts/struts2/trunk/src/main/idea/project.xml Wed Oct 31 13:32:54 2007
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
/*
- * $Id: Action.java 502296 2007-02-01 17:33:39Z niallp $
+ * $Id$
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Propchange: struts/struts2/trunk/src/main/idea/project.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/struts2/trunk/src/main/idea/project.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: struts/struts2/trunk/src/main/idea/workspace.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/src/main/idea/workspace.xml?rev=590812&r1=590811&r2=590812&view=diff
==============================================================================
--- struts/struts2/trunk/src/main/idea/workspace.xml (original)
+++ struts/struts2/trunk/src/main/idea/workspace.xml Wed Oct 31 13:32:54 2007
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
/*
- * $Id: Action.java 502296 2007-02-01 17:33:39Z niallp $
+ * $Id$
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Propchange: struts/struts2/trunk/src/main/idea/workspace.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/struts2/trunk/src/main/idea/workspace.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: struts/struts2/trunk/src/site/resources/images/download.gif
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: struts/struts2/trunk/src/site/resources/images/help.gif
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: struts/struts2/trunk/src/site/resources/images/plugins.gif
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: struts/struts2/trunk/src/site/resources/images/struts2-arch.png
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: struts/struts2/trunk/src/site/resources/images/struts2-merger.png
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: struts/struts2/trunk/src/site/resources/images/struts2-merger2.png
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: struts/struts2/trunk/src/site/resources/images/struts2.png
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: struts/struts2/trunk/src/site/site.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/src/site/site.xml?rev=590812&r1=590811&r2=590812&view=diff
==============================================================================
--- struts/struts2/trunk/src/site/site.xml (original)
+++ struts/struts2/trunk/src/site/site.xml Wed Oct 31 13:32:54 2007
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
/*
- * $Id: Action.java 502296 2007-02-01 17:33:39Z niallp $
+ * $Id$
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Propchange: struts/struts2/trunk/src/site/site.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/struts2/trunk/src/site/site.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
