You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ev...@apache.org on 2007/09/24 11:14:03 UTC
svn commit: r578718 - in /maven/continuum/trunk/continuum-webapp/src/main:
java/org/apache/maven/continuum/web/action/
java/org/apache/maven/continuum/web/action/admin/ resources/
webapp/WEB-INF/jsp/navigations/
Author: evenisse
Date: Mon Sep 24 02:14:02 2007
New Revision: 578718
URL: http://svn.apache.org/viewvc?rev=578718&view=rev
Log:
Fix some redirections
Modified:
maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AbstractBuildDefinitionAction.java
maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction.java
maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml
maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/Menu.jsp
Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AbstractBuildDefinitionAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AbstractBuildDefinitionAction.java?rev=578718&r1=578717&r2=578718&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AbstractBuildDefinitionAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AbstractBuildDefinitionAction.java Mon Sep 24 02:14:02 2007
@@ -1,3 +1,5 @@
+package org.apache.maven.continuum.web.action;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -16,7 +18,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.continuum.web.action;
import java.util.LinkedList;
import java.util.List;
Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction.java?rev=578718&r1=578717&r2=578718&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction.java Mon Sep 24 02:14:02 2007
@@ -1,18 +1,23 @@
+package org.apache.maven.continuum.web.action.admin;
+
/*
- * 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.
+ * 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.maven.continuum.web.action.admin;
import java.util.ArrayList;
import java.util.Collection;
Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml?rev=578718&r1=578717&r2=578718&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml Mon Sep 24 02:14:02 2007
@@ -608,54 +608,55 @@
-->
<action name="buildDefinitionTemplates" class="buildDefinitionTemplates" method="summary">
<result name="success">/WEB-INF/jsp/admin/buildDefinitionTemplateSummary.jsp</result>
- </action>
+ </action>
<action name="buildDefinitionTemplate" class="buildDefinitionTemplates" method="input">
<result name="success">/WEB-INF/jsp/admin/editBuildDefinitionTemplate.jsp</result>
<result name="input">/WEB-INF/jsp/admin/editBuildDefinitionTemplate.jsp</result>
- </action>
+ </action>
<action name="editBuildDefinitionTemplate" class="buildDefinitionTemplates" method="edit">
<result name="success">/WEB-INF/jsp/admin/editBuildDefinitionTemplate.jsp</result>
<result name="input">/WEB-INF/jsp/admin/editBuildDefinitionTemplate.jsp</result>
- </action>
+ </action>
<action name="deleteDefinitionTemplate" class="buildDefinitionTemplates" method="delete">
<result name="success" type="redirect-action">
- <param name="actionName">buildDefinitionTemplates!summary.action</param>
+ <param name="actionName">buildDefinitionTemplates.action</param>
</result>
- </action>
+ </action>
<action name="saveBuildDefinitionTemplate" class="buildDefinitionTemplates" method="save">
<result name="success" type="redirect-action">
- <param name="actionName">editBuildDefinitionTemplate!edit.action</param>
- <param name="buildDefinitionTemplate.id">${buildDefinitionTemplate.id}</param>
+ <param name="actionName">buildDefinitionTemplates.action</param>
</result>
<result name="input">/WEB-INF/jsp/admin/editBuildDefinitionTemplate.jsp</result>
- </action>
+ </action>
<action name="editBuildDefinitionAsTemplate" class="buildDefinitionTemplates" method="editBuildDefinition">
<result name="success">/WEB-INF/jsp/admin/editBuildDefinitionAsTemplate.jsp</result>
<result name="input">/WEB-INF/jsp/admin/editBuildDefinitionAsTemplate.jsp</result>
- </action>
+ </action>
<action name="saveBuildDefinitionAsTemplate" class="buildDefinitionTemplates" method="saveBuildDefinition">
- <result name="success">/WEB-INF/jsp/admin/editBuildDefinitionAsTemplate.jsp</result>
+ <result name="success" type="redirect-action">
+ <param name="actionName">buildDefinitionTemplates.action</param>
+ </result>
<result name="input">/WEB-INF/jsp/admin/editBuildDefinitionAsTemplate.jsp</result>
- </action>
+ </action>
<action name="buildDefinitionAsTemplate" class="buildDefinitionTemplates" method="saveBuildDefinition">
- <result name="success">/WEB-INF/jsp/admin/editBuildDefinitionAsTemplate.jsp</result>
+ <result name="success" type="redirect-action">
+ <param name="actionName">buildDefinitionTemplates.action</param>
+ </result>
<result name="input">/WEB-INF/jsp/admin/editBuildDefinitionAsTemplate.jsp</result>
- </action>
+ </action>
<action name="deleteBuildDefinitionAsTemplate" class="buildDefinitionTemplates" method="deleteBuildDefinition">
<result name="success" type="redirect-action">
- <param name="actionName">buildDefinitionTemplates!summary.action</param>
+ <param name="actionName">buildDefinitionTemplates.action</param>
</result>
- </action>
-
-
+ </action>
</package>
<package name="component" extends="default">
Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/Menu.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/Menu.jsp?rev=578718&r1=578717&r2=578718&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/Menu.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/Menu.jsp Mon Sep 24 02:14:02 2007
@@ -113,7 +113,7 @@
</div>
</redback:ifAuthorized>
<redback:ifAuthorized permission="continuum-manage-build-templates">
- <ww:url id="buildDefinitionTemplatesUrl" action="buildDefinitionTemplates" namespace="/admin" method="summary" includeParams="none"/>
+ <ww:url id="buildDefinitionTemplatesUrl" action="buildDefinitionTemplates" namespace="/admin" includeParams="none"/>
<div class="body">
<ww:a href="%{buildDefinitionTemplatesUrl}">
<ww:text name="menu.administration.buildDefinitionTemplates"/>