[CONF] Confluence Changes in the last 24 hours
- This is a daily summary of all recent changes in Confluence. - Updated Spaces: - Apache Directory Community & Resources (directory) http://cwiki.apache.org/confluence/display/directory | |-Pages Added or Edited in This Space |-- The team was last edited by ck (01:31 AM). | http://cwiki.apache.org/confluence/display/directory/The+team Apache Camel (CAMEL) http://cwiki.apache.org/confluence/display/CAMEL | |-Pages Added or Edited in This Space |-- Camel 2.0 Design was last edited by davsclaus (11:36 AM). | http://cwiki.apache.org/confluence/display/CAMEL/Camel+2.0+Design Apache Cassandra (CSDR) http://cwiki.apache.org/confluence/display/CSDR | |-Pages Added or Edited in This Space |-- ThriftInterface was last edited by johan (01:59 PM). | http://cwiki.apache.org/confluence/display/CSDR/ThriftInterface |-- GettingStarted was last edited by johan (01:57 PM). | http://cwiki.apache.org/confluence/display/CSDR/GettingStarted Apache MINA SSHD (SSHD) http://cwiki.apache.org/confluence/display/SSHD | |-Pages Added or Edited in This Space |-- Embedding SSHD in 5 minutes was last edited by paliwalash...@gmail.com (07:03 AM). | http://cwiki.apache.org/confluence/display/SSHD/Embedding+SSHD+in+5+minutes Apache Struts 2 Documentation (WW) http://cwiki.apache.org/confluence/display/WW | |-Pages Added or Edited in This Space |-- web.xml was last edited by rgielen (08:08 AM). | http://cwiki.apache.org/confluence/display/WW/web.xml - CONFLUENCE INFORMATION This message is automatically generated by Confluence Unsubscribe or edit your notifications preferences http://cwiki.apache.org/confluence/users/viewnotifications.action If you think it was sent incorrectly contact one of the administrators http://cwiki.apache.org/confluence/administrators.action If you want more information on Confluence, or have a bug to report see http://www.atlassian.com/software/confluence
svn commit: r768802 - /struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/views/freemarker/PortletFreemarkerResult.java
Author: nilsga
Date: Sun Apr 26 21:34:14 2009
New Revision: 768802
URL: http://svn.apache.org/viewvc?rev=768802&view=rev
Log:
WW-3087 Using session to store location.
Modified:
struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/views/freemarker/PortletFreemarkerResult.java
Modified:
struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/views/freemarker/PortletFreemarkerResult.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/views/freemarker/PortletFreemarkerResult.java?rev=768802&r1=768801&r2=768802&view=diff
==
---
struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/views/freemarker/PortletFreemarkerResult.java
(original)
+++
struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/views/freemarker/PortletFreemarkerResult.java
Sun Apr 26 21:34:14 2009
@@ -51,7 +51,7 @@
/**
*/
-public class PortletFreemarkerResult extends StrutsResultSupport {
+public class PortletFreemarkerResult extends StrutsResultSupport implements
PortletActionConstants{
private static final long serialVersionUID = -5570612389289887543L;
@@ -120,8 +120,8 @@
ActionInvocation invocation) {
ActionResponse res = PortletActionContext.getActionResponse();
// View is rendered outside an action...uh oh...
+
invocation.getInvocationContext().getSession().put(RENDER_DIRECT_LOCATION,
location);
res.setRenderParameter(PortletActionConstants.ACTION_PARAM,
"freemarkerDirect");
-res.setRenderParameter("location", location);
res.setRenderParameter(PortletActionConstants.MODE_PARAM,
PortletActionContext
.getRequest().getPortletMode().toString());
svn commit: r768803 - in /struts/struts2/trunk/plugins/portlet/src/test/java/org/apache/struts2/views/freemarker: ./ PortletFreemarkerResultTest.java
Author: nilsga
Date: Sun Apr 26 21:34:45 2009
New Revision: 768803
URL: http://svn.apache.org/viewvc?rev=768803&view=rev
Log:
WW-3087 Using session to store location.
Added:
struts/struts2/trunk/plugins/portlet/src/test/java/org/apache/struts2/views/freemarker/
struts/struts2/trunk/plugins/portlet/src/test/java/org/apache/struts2/views/freemarker/PortletFreemarkerResultTest.java
Added:
struts/struts2/trunk/plugins/portlet/src/test/java/org/apache/struts2/views/freemarker/PortletFreemarkerResultTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/portlet/src/test/java/org/apache/struts2/views/freemarker/PortletFreemarkerResultTest.java?rev=768803&view=auto
==
---
struts/struts2/trunk/plugins/portlet/src/test/java/org/apache/struts2/views/freemarker/PortletFreemarkerResultTest.java
(added)
+++
struts/struts2/trunk/plugins/portlet/src/test/java/org/apache/struts2/views/freemarker/PortletFreemarkerResultTest.java
Sun Apr 26 21:34:45 2009
@@ -0,0 +1,105 @@
+/*
+ * $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.views.freemarker;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.portlet.ActionRequest;
+import javax.portlet.ActionResponse;
+import javax.portlet.PortletContext;
+import javax.portlet.PortletMode;
+
+import org.apache.struts2.StrutsStatics;
+import org.apache.struts2.portlet.PortletActionConstants;
+import org.jmock.Mock;
+import org.jmock.cglib.MockObjectTestCase;
+import org.jmock.core.Constraint;
+
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.ActionProxy;
+
+public class PortletFreemarkerResultTest extends MockObjectTestCase implements
PortletActionConstants {
+
+Mock mockInvocation = null;
+Mock mockConfig = null;
+Mock mockCtx = null;
+
+public void setUp() throws Exception {
+super.setUp();
+mockInvocation = mock(ActionInvocation.class);
+mockCtx = mock(PortletContext.class);
+
+Map paramMap = new HashMap();
+Map sessionMap = new HashMap();
+
+Map context = new HashMap();
+context.put(ActionContext.SESSION, sessionMap);
+context.put(ActionContext.PARAMETERS, paramMap);
+context.put(StrutsStatics.STRUTS_PORTLET_CONTEXT, mockCtx.proxy());
+
+ActionContext.setContext(new ActionContext(context));
+
+
mockInvocation.stubs().method("getInvocationContext").will(returnValue(ActionContext.getContext()));
+
+}
+
+public void testDoExecute_event_locationIsJsp() {
+Mock mockRequest = mock(ActionRequest.class);
+Mock mockResponse = mock(ActionResponse.class);
+Mock mockProxy = mock(ActionProxy.class);
+
+Constraint[] params = new
Constraint[]{eq(PortletActionConstants.ACTION_PARAM), eq("freemarkerDirect")};
+mockResponse.expects(once()).method("setRenderParameter").with(params);
+params = new Constraint[]{eq(PortletActionConstants.MODE_PARAM),
eq(PortletMode.VIEW.toString())};
+mockResponse.expects(once()).method("setRenderParameter").with(params);
+
mockRequest.stubs().method("getPortletMode").will(returnValue(PortletMode.VIEW));
+mockProxy.stubs().method("getNamespace").will(returnValue(""));
+
+
mockInvocation.stubs().method("getProxy").will(returnValue(mockProxy.proxy()));
+
+ActionContext ctx = ActionContext.getContext();
+
+Map session = new HashMap();
+
+ctx.put(PortletActionConstants.REQUEST, mockRequest.proxy());
+ctx.put(PortletActionConstants.RESPONSE, mockResponse.proxy());
+ctx.put(PortletActionConstants.PHASE,
PortletActionConstants.EVENT_PHASE);
+ctx.put(ActionContext.SESSION, session);
+
+PortletFreemarkerResult result = new PortletFreemarkerResult();
+try {
+result.doExecute("/WEB-INF/pages/testJsp.ftl",
(ActionInvocation)mockInvocation.proxy());
+}
+catch(Exception e) {
+e.printStackTrace();
+fail("Error occured!");
+}
+assertEquals("/WEB-INF/pages/
svn commit: r768826 - in /struts/struts2/trunk/plugins/convention/src: main/java/org/apache/struts2/convention/ main/java/org/apache/struts2/convention/annotation/ test/java/org/apache/struts2/convent
Author: musachy
Date: Sun Apr 26 22:58:17 2009
New Revision: 768826
URL: http://svn.apache.org/viewvc?rev=768826&view=rev
Log:
WW-3101 @Action and @Actions should be able to be applied to classes, the
method will be determined at runtime by Dynamic Action invocation mechanism
Added:
struts/struts2/trunk/plugins/convention/src/test/java/org/apache/struts2/convention/actions/action/ClassLevelAnnotationAction.java
struts/struts2/trunk/plugins/convention/src/test/java/org/apache/struts2/convention/actions/action/ClassLevelAnnotationDefaultMethodAction.java
struts/struts2/trunk/plugins/convention/src/test/java/org/apache/struts2/convention/actions/action/ClassLevelAnnotationsAction.java
struts/struts2/trunk/plugins/convention/src/test/java/org/apache/struts2/convention/actions/action/ClassLevelAnnotationsDefaultMethodAction.java
Modified:
struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java
struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/annotation/Action.java
struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/annotation/Actions.java
struts/struts2/trunk/plugins/convention/src/test/java/org/apache/struts2/convention/PackageBasedActionConfigBuilderTest.java
Modified:
struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java?rev=768826&r1=768825&r2=768826&view=diff
==
---
struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java
(original)
+++
struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java
Sun Apr 26 22:58:17 2009
@@ -40,6 +40,7 @@
import com.opensymphony.xwork2.util.finder.ClassLoaderInterfaceDelegate;
import com.opensymphony.xwork2.util.logging.Logger;
import com.opensymphony.xwork2.util.logging.LoggerFactory;
+import com.opensymphony.xwork2.util.logging.LoggerUtils;
import org.apache.commons.lang.xwork.StringUtils;
import org.apache.commons.lang.xwork.ObjectUtils;
import org.apache.struts2.StrutsConstants;
@@ -99,6 +100,8 @@
private boolean reload;
private Set fileProtocols;
+private static final String DEFAULT_METHOD = "execute";
+
/**
* Constructs actions based on a list of packages.
*
@@ -459,6 +462,9 @@
Map packageConfigs = new
HashMap();
for (Class actionClass : classes) {
+Actions actionsAnnotation =
actionClass.getAnnotation(Actions.class);
+Action actionAnnotation = actionClass.getAnnotation(Action.class);
+
// Skip classes that can't be instantiated
if (cannotInstantiate(actionClass)) {
if (LOG.isTraceEnabled())
@@ -485,7 +491,6 @@
List namespaces = determineActionNamespace(actionClass);
for (String namespace : namespaces) {
String defaultActionName = determineActionName(actionClass);
-String defaultActionMethod = "execute";
PackageConfig.Builder defaultPackageConfig =
getPackageConfig(packageConfigs, namespace,
actionPackage, actionClass, null);
@@ -493,7 +498,10 @@
// configuration should still be built or not.
Map> map =
getActionAnnotations(actionClass);
Set actionNames = new HashSet();
-if (!map.containsKey(defaultActionMethod) &&
ReflectionTools.containsMethod(actionClass, defaultActionMethod)) {
+boolean hasDefaultMethod =
ReflectionTools.containsMethod(actionClass, DEFAULT_METHOD);
+if (!map.containsKey(DEFAULT_METHOD)
+&& hasDefaultMethod
+&& actionAnnotation == null && actionsAnnotation ==
null) {
boolean found = false;
for (String method : map.keySet()) {
List actions = map.get(method);
@@ -518,7 +526,7 @@
// Build the default
if (!found) {
-createActionConfig(defaultPackageConfig, actionClass,
defaultActionName, defaultActionMethod, null);
+createActionConfig(defaultPackageConfig, actionClass,
defaultActionName, DEFAULT_METHOD, null);
}
}
@@ -538,10 +546,18 @@
// some actions will not have any @Action or a default method,
like the rest actions
// where the action mapper is the one that finds the right
method at runtime
-if (map.isEmpty() && mapAllMatches) {
svn commit: r768836 - in /struts: maven/trunk/pom/pom.xml site/src/site/xdoc/dev/volunteers.xml
Author: martinc Date: Mon Apr 27 00:12:36 2009 New Revision: 768836 URL: http://svn.apache.org/viewvc?rev=768836&view=rev Log: New committer - Lukasz Lenart. Modified: struts/maven/trunk/pom/pom.xml struts/site/src/site/xdoc/dev/volunteers.xml Modified: struts/maven/trunk/pom/pom.xml URL: http://svn.apache.org/viewvc/struts/maven/trunk/pom/pom.xml?rev=768836&r1=768835&r2=768836&view=diff == --- struts/maven/trunk/pom/pom.xml (original) +++ struts/maven/trunk/pom/pom.xml Mon Apr 27 00:12:36 2009 @@ -273,6 +273,14 @@ Committer + + Lukasz Lenart + lukaszlenart + lukaszlenart at apache.org + +Committer + + Modified: struts/site/src/site/xdoc/dev/volunteers.xml URL: http://svn.apache.org/viewvc/struts/site/src/site/xdoc/dev/volunteers.xml?rev=768836&r1=768835&r2=768836&view=diff == --- struts/site/src/site/xdoc/dev/volunteers.xml (original) +++ struts/site/src/site/xdoc/dev/volunteers.xml Mon Apr 27 00:12:36 2009 @@ -179,6 +179,10 @@ Mathias Bogaert (pathos at apache.org) + +Lukasz Lenart +(lukaszlenart at apache.org) +
svn commit: r768854 - in /struts/struts2/trunk: assembly/pom.xml core/pom.xml
Author: wesw
Date: Mon Apr 27 02:08:07 2009
New Revision: 768854
URL: http://svn.apache.org/viewvc?rev=768854&view=rev
Log:
WW-3100 changing to point to xwork 2.1.3 release in anticipation of struts
2.1.7 release
Modified:
struts/struts2/trunk/assembly/pom.xml
struts/struts2/trunk/core/pom.xml
Modified: struts/struts2/trunk/assembly/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/assembly/pom.xml?rev=768854&r1=768853&r2=768854&view=diff
==
--- struts/struts2/trunk/assembly/pom.xml (original)
+++ struts/struts2/trunk/assembly/pom.xml Mon Apr 27 02:08:07 2009
@@ -72,7 +72,7 @@
com.opensymphony
xwork
-2.1.2
+2.1.3
jar
jdk14
runtime
@@ -245,7 +245,7 @@
com.opensymphony
xwork
javadoc
-2.1.2
+2.1.3
${project.build.directory}/xwork-apidocs
Modified: struts/struts2/trunk/core/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/pom.xml?rev=768854&r1=768853&r2=768854&view=diff
==
--- struts/struts2/trunk/core/pom.xml (original)
+++ struts/struts2/trunk/core/pom.xml Mon Apr 27 02:08:07 2009
@@ -56,7 +56,7 @@
com.opensymphony
xwork
-2.1.3-SNAPSHOT
+2.1.3
sources
@@ -229,7 +229,7 @@
com.opensymphony
xwork
-2.1.3-SNAPSHOT
+2.1.3
svn commit: r768855 - in /struts/struts2/trunk/core/src/main/java/org/apache/struts2: components/ dispatcher/ dispatcher/mapper/ interceptor/ util/ views/jsp/ views/jsp/ui/
Author: wesw
Date: Mon Apr 27 02:09:35 2009
New Revision: 768855
URL: http://svn.apache.org/viewvc?rev=768855&view=rev
Log:
WW-3102 minor changes per findbugs analysis
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ActionComponent.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Bean.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Component.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Date.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ElseIf.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/FormButton.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Param.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ServletUrlRenderer.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ApplicationMap.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/DefaultStaticContentLoader.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/RequestMap.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/SessionMap.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/Restful2ActionMapper.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/RestfulActionMapper.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/CheckboxInterceptor.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/MessageStoreInterceptor.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/ScopeInterceptor.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/DateFormatter.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/FastByteArrayOutputStream.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/IteratorStatus.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/AnchorTag.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ActionComponent.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ActionComponent.java?rev=768855&r1=768854&r2=768855&view=diff
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ActionComponent.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ActionComponent.java
Mon Apr 27 02:09:35 2009
@@ -128,7 +128,6 @@
protected ValueStackFactory valueStackFactory;
protected ActionProxyFactory actionProxyFactory;
protected ActionProxy proxy;
-protected ActionMapper actionMapper;
protected String name;
protected String namespace;
protected boolean executeResult;
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Bean.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Bean.java?rev=768855&r1=768854&r2=768855&view=diff
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Bean.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Bean.java
Mon Apr 27 02:09:35 2009
@@ -97,7 +97,7 @@
@StrutsTag(name="bean", tldTagClass="org.apache.struts2.views.jsp.BeanTag",
description="Instantiate a JavaBean and place it in the context")
public class Bean extends ContextBean {
-protected static Logger LOG = LoggerFactory.getLogger(Bean.class);
+protected static final Logger LOG = LoggerFactory.getLogger(Bean.class);
protected Object bean;
protected String name;
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Component.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Component.java?rev=768855&r1=768854&r2=768855&view=diff
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Component.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Component.java
Mon Apr 27 02:09:35 2009
@@ -403,7 +403,7 @@
boolean includeContext, boolean
encodeResult, boolean forceAddSchemeHostAndPort,
boolean escapeAmp) {
String finalAction = findS
svn commit: r768856 - /struts/maven/trunk/pom/pom.xml
Author: wesw Date: Mon Apr 27 02:19:25 2009 New Revision: 768856 URL: http://svn.apache.org/viewvc?rev=768856&view=rev Log: [maven-release-plugin] prepare release struts-master-5 Modified: struts/maven/trunk/pom/pom.xml Modified: struts/maven/trunk/pom/pom.xml URL: http://svn.apache.org/viewvc/struts/maven/trunk/pom/pom.xml?rev=768856&r1=768855&r2=768856&view=diff == --- struts/maven/trunk/pom/pom.xml (original) +++ struts/maven/trunk/pom/pom.xml Mon Apr 27 02:19:25 2009 @@ -17,8 +17,7 @@ limitations under the License. --> -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";> +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";> 4.0.0 org.apache @@ -27,14 +26,14 @@ org.apache.struts struts-master - 5-SNAPSHOT + 5 pom Apache Struts - scm:svn:http://svn.apache.org/repos/asf/struts/maven/trunk/pom - scm:svn:http://svn.apache.org/repos/asf/struts/maven/trunk/pom - http://svn.apache.org/repos/asf/struts/maven/trunk/pom + scm:svn:http://svn.apache.org/repos/asf/struts/maven/tags/struts-master-5 + scm:svn:http://svn.apache.org/repos/asf/struts/maven/tags/struts-master-5 + http://svn.apache.org/repos/asf/struts/maven/tags/struts-master-5
svn commit: r768861 - /struts/maven/tags/struts-master-5/
Author: wesw Date: Mon Apr 27 03:13:30 2009 New Revision: 768861 URL: http://svn.apache.org/viewvc?rev=768861&view=rev Log: [maven-release-plugin] copy for tag struts-master-5 Added: struts/maven/tags/struts-master-5/ - copied from r768859, struts/maven/trunk/pom/
svn commit: r768862 - /struts/maven/trunk/pom/pom.xml
Author: wesw Date: Mon Apr 27 03:18:24 2009 New Revision: 768862 URL: http://svn.apache.org/viewvc?rev=768862&view=rev Log: [maven-release-plugin] rollback the release of struts-master-5 Modified: struts/maven/trunk/pom/pom.xml Modified: struts/maven/trunk/pom/pom.xml URL: http://svn.apache.org/viewvc/struts/maven/trunk/pom/pom.xml?rev=768862&r1=768861&r2=768862&view=diff == --- struts/maven/trunk/pom/pom.xml (original) +++ struts/maven/trunk/pom/pom.xml Mon Apr 27 03:18:24 2009 @@ -17,7 +17,8 @@ limitations under the License. --> -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";> +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";> 4.0.0 org.apache @@ -26,14 +27,14 @@ org.apache.struts struts-master - 5 + 5-SNAPSHOT pom Apache Struts - scm:svn:http://svn.apache.org/repos/asf/struts/maven/tags/struts-master-5 - scm:svn:http://svn.apache.org/repos/asf/struts/maven/tags/struts-master-5 - http://svn.apache.org/repos/asf/struts/maven/tags/struts-master-5 + scm:svn:http://svn.apache.org/repos/asf/struts/maven/trunk/pom + scm:svn:http://svn.apache.org/repos/asf/struts/maven/trunk/pom + http://svn.apache.org/repos/asf/struts/maven/trunk/pom
