You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ol...@apache.org on 2008/07/25 00:31:26 UTC
svn commit: r679588 [8/8] - in /continuum/branches/CONTINUUM-782: ./
continuum-api/ continuum-api/src/main/java/org/apache/continuum/purge/
continuum-api/src/main/java/org/apache/continuum/purge/controller/
continuum-api/src/main/java/org/apache/contin...
Added: continuum/branches/CONTINUUM-782/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/LocalRepositoryAction-saveRepository-validation.xml
URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-782/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/LocalRepositoryAction-saveRepository-validation.xml?rev=679588&view=auto
==============================================================================
--- continuum/branches/CONTINUUM-782/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/LocalRepositoryAction-saveRepository-validation.xml (added)
+++ continuum/branches/CONTINUUM-782/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/LocalRepositoryAction-saveRepository-validation.xml Thu Jul 24 15:31:19 2008
@@ -0,0 +1,35 @@
+<!--
+ ~ 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.
+ -->
+
+<!DOCTYPE validators PUBLIC
+ "-//OpenSymphony Group//XWork Validator 1.0.2//EN"
+ "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
+
+<validators>
+ <field name="repository.name">
+ <field-validator type="requiredstring">
+ <message key="repository.name.required"/>
+ </field-validator>
+ </field>
+ <field name="repository.location">
+ <field-validator type="requiredstring">
+ <message key="repository.location.required"/>
+ </field-validator>
+ </field>
+</validators>
Propchange: continuum/branches/CONTINUUM-782/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/LocalRepositoryAction-saveRepository-validation.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: continuum/branches/CONTINUUM-782/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/LocalRepositoryAction-saveRepository-validation.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: continuum/branches/CONTINUUM-782/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/LocalRepositoryAction.properties
URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-782/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/LocalRepositoryAction.properties?rev=679588&view=auto
==============================================================================
--- continuum/branches/CONTINUUM-782/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/LocalRepositoryAction.properties (added)
+++ continuum/branches/CONTINUUM-782/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/LocalRepositoryAction.properties Thu Jul 24 15:31:19 2008
@@ -0,0 +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.
+#
+
+repository.name.required = You must define a name.
+repository.location.required = You must define a local repository directory.
Propchange: continuum/branches/CONTINUUM-782/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/LocalRepositoryAction.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: continuum/branches/CONTINUUM-782/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/LocalRepositoryAction.properties
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: continuum/branches/CONTINUUM-782/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/PurgeConfigurationAction-savePurgeConfig-validation.xml
URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-782/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/PurgeConfigurationAction-savePurgeConfig-validation.xml?rev=679588&view=auto
==============================================================================
--- continuum/branches/CONTINUUM-782/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/PurgeConfigurationAction-savePurgeConfig-validation.xml (added)
+++ continuum/branches/CONTINUUM-782/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/PurgeConfigurationAction-savePurgeConfig-validation.xml Thu Jul 24 15:31:19 2008
@@ -0,0 +1,37 @@
+<!--
+ ~ 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.
+ -->
+
+<!DOCTYPE validators PUBLIC
+ "-//OpenSymphony Group//XWork Validator 1.0.2//EN"
+ "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
+
+<validators>
+ <field name="daysOlder">
+ <field-validator type="int">
+ <param name="min">0</param>
+ <message key="purgeConfig.daysOlder.min"/>
+ </field-validator>
+ </field>
+ <field name="retentionCount">
+ <field-validator type="int">
+ <param name="min">1</param>
+ <message key="purgeConfig.retentionCount.min"/>
+ </field-validator>
+ </field>
+</validators>
Propchange: continuum/branches/CONTINUUM-782/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/PurgeConfigurationAction-savePurgeConfig-validation.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: continuum/branches/CONTINUUM-782/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/PurgeConfigurationAction-savePurgeConfig-validation.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: continuum/branches/CONTINUUM-782/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/PurgeConfigurationAction.properties
URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-782/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/PurgeConfigurationAction.properties?rev=679588&view=auto
==============================================================================
--- continuum/branches/CONTINUUM-782/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/PurgeConfigurationAction.properties (added)
+++ continuum/branches/CONTINUUM-782/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/PurgeConfigurationAction.properties Thu Jul 24 15:31:19 2008
@@ -0,0 +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.
+#
+
+purgeConfig.daysOlder.min = Days Older must be a positive number.
+purgeConfig.retentionCount.min = Retention Count must be greater than 0.
\ No newline at end of file
Propchange: continuum/branches/CONTINUUM-782/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/PurgeConfigurationAction.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: continuum/branches/CONTINUUM-782/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/PurgeConfigurationAction.properties
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Modified: continuum/branches/CONTINUUM-782/continuum-webapp/src/main/resources/xwork.xml
URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-782/continuum-webapp/src/main/resources/xwork.xml?rev=679588&r1=679587&r2=679588&view=diff
==============================================================================
--- continuum/branches/CONTINUUM-782/continuum-webapp/src/main/resources/xwork.xml (original)
+++ continuum/branches/CONTINUUM-782/continuum-webapp/src/main/resources/xwork.xml Thu Jul 24 15:31:19 2008
@@ -747,6 +747,84 @@
</result>
</action>
+ <!--
+ * Local Repository actions
+ -->
+
+ <action name="repositoryList" class="localRepository" method="list">
+ <result name="success">/WEB-INF/jsp/admin/localRepositoriesList.jsp</result>
+ </action>
+
+ <action name="editRepository" class="localRepository" method="input">
+ <result name="error">/WEB-INF/jsp/admin/editLocalRepository.jsp</result>
+ <result name="input">/WEB-INF/jsp/admin/editLocalRepository.jsp</result>
+ </action>
+
+ <action name="saveRepository" class="localRepository" method="save">
+ <result name="error">/WEB-INF/jsp/admin/editLocalRepository.jsp</result>
+ <result name="input">/WEB-INF/jsp/admin/editLocalRepository.jsp</result>
+ <result name="success" type="redirect-action">
+ <param name="actionName">repositoryList</param>
+ </result>
+ </action>
+
+ <action name="removeRepository" class="localRepository" method="remove">
+ <result name="error" type="redirect-action">
+ <param name="actionName">repositoryList</param>
+ <param name="errorMessage">${message}</param>
+ </result>
+ <result name="confirm">/WEB-INF/jsp/admin/confirmDeleteLocalRepository.jsp</result>
+ <result name="success" type="redirect-action">
+ <param name="actionName">repositoryList</param>
+ </result>
+ </action>
+
+ <action name="purgeRepository" class="localRepository" method="doPurge">
+ <result name="success" type="redirect-action">
+ <param name="actionName">repositoryList</param>
+ </result>
+ <result name="error" type="redirect-action">
+ <param name="actionName">repositoryList</param>
+ <param name="errorMessage">${message}</param>
+ </result>
+ </action>
+
+ <!--
+ * Purge actions
+ -->
+
+ <action name="purgeConfigList" class="purgeConfiguration" method="list">
+ <result name="success">/WEB-INF/jsp/admin/purgeConfigurationsList.jsp</result>
+ </action>
+
+ <action name="editPurgeConfig" class="purgeConfiguration" method="input">
+ <result name="error">/WEB-INF/jsp/admin/editPurgeConfiguration.jsp</result>
+ <result name="input">/WEB-INF/jsp/admin/editPurgeConfiguration.jsp</result>
+ </action>
+
+ <action name="savePurgeConfig" class="purgeConfiguration" method="save">
+ <result name="input">/WEB-INF/jsp/admin/editPurgeConfiguration.jsp</result>
+ <result name="success" type="redirect-action">
+ <param name="actionName">purgeConfigList</param>
+ </result>
+ </action>
+
+ <action name="removePurgeConfig" class="purgeConfiguration" method="remove">
+ <result name="success" type="redirect-action">
+ <param name="actionName">purgeConfigList</param>
+ </result>
+ </action>
+
+ <action name="doPurge" class="purgeConfiguration" method="purge">
+ <result name="success" type="redirect-action">
+ <param name="actionName">purgeConfigList</param>
+ </result>
+ <result name="error" type="redirect-action">
+ <param name="actionName">purgeConfigList</param>
+ <param name="errorMessage">${message}</param>
+ </result>
+ </action>
+
</package>
<package name="component" extends="default">
@@ -934,6 +1012,6 @@
<result name="input">/WEB-INF/jsp/notifier/notifierWagon.jsp</result>
<result name="success" type="chain">projectGroupNotifier</result>
</action>
-
+
</package>
</xwork>
Added: continuum/branches/CONTINUUM-782/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteLocalRepository.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-782/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteLocalRepository.jsp?rev=679588&view=auto
==============================================================================
--- continuum/branches/CONTINUUM-782/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteLocalRepository.jsp (added)
+++ continuum/branches/CONTINUUM-782/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteLocalRepository.jsp Thu Jul 24 15:31:19 2008
@@ -0,0 +1,55 @@
+<%--
+ ~ 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.
+ --%>
+
+<%@ taglib uri="/webwork" prefix="ww" %>
+<%@ taglib uri="continuum" prefix="c1" %>
+<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
+<html>
+ <ww:i18n name="localization.Continuum">
+ <head>
+ <title><ww:text name="deleteRepository.page.title"/></title>
+ </head>
+ <body>
+ <div id="axial" class="h3">
+ <h3><ww:text name="deleteRepository.section.title"/></h3>
+ <div class="axial">
+ <ww:form action="removeRepository" method="post">
+ <ww:hidden name="repository.id"/>
+ <ww:hidden name="confirmed" value="true"/>
+ <ww:actionerror/>
+
+ <div class="warningmessage">
+ <p>
+ <strong>
+ <ww:text name="deleteRepository.confirmation.message">
+ <ww:param><ww:property value="%{repository.name}"/></ww:param>
+ </ww:text>
+ </strong>
+ </p>
+ </div>
+
+ <div class="functnbar3">
+ <c1:submitcancel value="%{getText('delete')}" cancel="%{getText('cancel')}"/>
+ </div>
+ </ww:form>
+ </div>
+ </div>
+ </body>
+ </ww:i18n>
+</html>
Propchange: continuum/branches/CONTINUUM-782/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteLocalRepository.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: continuum/branches/CONTINUUM-782/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteLocalRepository.jsp
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: continuum/branches/CONTINUUM-782/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editLocalRepository.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-782/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editLocalRepository.jsp?rev=679588&view=auto
==============================================================================
--- continuum/branches/CONTINUUM-782/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editLocalRepository.jsp (added)
+++ continuum/branches/CONTINUUM-782/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editLocalRepository.jsp Thu Jul 24 15:31:19 2008
@@ -0,0 +1,65 @@
+<%--
+ ~ 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.
+ --%>
+
+<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
+<%@ taglib uri="/webwork" prefix="ww" %>
+<%@ taglib uri="continuum" prefix="c1" %>
+<html>
+ <ww:i18n name="localization.Continuum">
+<head>
+<title><ww:text name="repository.page.title"/></title>
+</head>
+<body>
+<div class="app">
+ <div id="axial" class="h3">
+ <h3><ww:text name="repository.page.title"/></h3>
+
+ <div class="axial">
+ <ww:form action="saveRepository" method="post" validate="true">
+ <c:if test="${!empty actionErrors}">
+ <div class="errormessage">
+ <c:forEach items="${actionErrors}" var="actionError">
+ <p><ww:text name="${actionError}"/></p>
+ </c:forEach>
+ </div>
+ </c:if>
+
+ <table>
+ <ww:textfield label="%{getText('repository.name.label')}" name="repository.name" required="true" disabled="%{defaultRepo}"/>
+ <ww:textfield label="%{getText('repository.location.label')}" name="repository.location" required="true" disabled="%{defaultRepo}"/>
+ <ww:select label="%{getText('repository.layout.label')}" name="repository.layout" list="layouts" disabled="%{defaultRepo}"/>
+ </table>
+ <ww:hidden name="repository.id"/>
+ <c:if test="${defaultRepo}">
+ <ww:hidden name="repository.name"/>
+ <ww:hidden name="repository.location"/>
+ <ww:hidden name="repository.layout"/>
+ </c:if>
+ <div class="functnbar3">
+ <c1:submitcancel value="%{getText('save')}" cancel="%{getText('cancel')}"/>
+ </div>
+
+ </ww:form>
+ </div>
+ </div>
+</div>
+
+</body>
+</ww:i18n>
+</html>
Propchange: continuum/branches/CONTINUUM-782/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editLocalRepository.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: continuum/branches/CONTINUUM-782/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editLocalRepository.jsp
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: continuum/branches/CONTINUUM-782/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editPurgeConfiguration.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-782/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editPurgeConfiguration.jsp?rev=679588&view=auto
==============================================================================
--- continuum/branches/CONTINUUM-782/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editPurgeConfiguration.jsp (added)
+++ continuum/branches/CONTINUUM-782/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editPurgeConfiguration.jsp Thu Jul 24 15:31:19 2008
@@ -0,0 +1,89 @@
+<%--
+ ~ 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.
+ --%>
+
+<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
+<%@ taglib uri="/webwork" prefix="ww" %>
+<%@ taglib uri="continuum" prefix="c1" %>
+<html>
+ <ww:i18n name="localization.Continuum">
+ <head>
+ <title><ww:text name="purgeConfig.page.title"/></title>
+ </head>
+ <body>
+ <div class="app">
+ <div id="axial" class="h3">
+ <h3><ww:text name="purgeConfig.section.title"/></h3>
+
+ <div class="axial">
+ <ww:form action="savePurgeConfig" method="post" validate="true">
+ <c:if test="${!empty actionErrors}">
+ <div class="errormessage">
+ <c:forEach items="${actionErrors}" var="actionError">
+ <p><ww:text name="${actionError}"/></p>
+ </c:forEach>
+ </div>
+ </c:if>
+ <c:choose>
+ <c:when test="${(!empty repositories) || purgeType == 'directory' }">
+ <table>
+ <c:choose>
+ <c:when test="${purgeType == 'repository'}">
+ <ww:select label="%{getText('purgeConfig.repository.label')}" name="repositoryId" list="repositories" required="true"/>
+ </c:when>
+ <c:otherwise>
+ <ww:select label="%{getText('purgeConfig.directoryType.label')}" name="directoryType" list="directoryTypes"/>
+ </c:otherwise>
+ </c:choose>
+ <ww:textfield label="%{getText('purgeConfig.daysOlder.label')}" name="daysOlder"/>
+ <ww:textfield label="%{getText('purgeConfig.retentionCount.label')}" name="retentionCount"/>
+ <ww:checkbox label="%{getText('purgeConfig.deleteAll.label')}" name="deleteAll"/>
+ <c:if test="${purgeType == 'repository'}">
+ <ww:checkbox label="%{getText('purgeConfig.deleteReleasedSnapshots.label')}" name="deleteReleasedSnapshots"/>
+ </c:if>
+ <c:choose>
+ <c:when test="${defaultPurgeConfiguration == true}">
+ <ww:hidden name="defaultPurgeConfiguration"/>
+ <ww:label label="%{getText('purgeConfig.defaultPurge.label')}" value="true"/>
+ </c:when>
+ <c:otherwise>
+ <ww:checkbox label="%{getText('purgeConfig.defaultPurge.label')}" name="defaultPurgeConfiguration" value="defaultPurgeConfiguration" fieldValue="true"/>
+ </c:otherwise>
+ </c:choose>
+ <ww:select label="%{getText('purgeConfig.schedule.label')}" name="scheduleId" list="schedules"
+ headerKey="-1" headerValue=""/>
+ <ww:textfield label="%{getText('purgeConfig.description.label')}" name="description"/>
+ </table>
+ <ww:hidden name="purgeConfigId"/>
+ <ww:hidden name="purgeType"/>
+ <div class="functnbar3">
+ <c1:submitcancel value="%{getText('save')}" cancel="%{getText('cancel')}"/>
+ </div>
+ </c:when>
+ <c:otherwise>
+ <div class="warningmessage" style="color: red"><ww:text name="purgeConfig.no.repositories" /></div>
+ </c:otherwise>
+ </c:choose>
+ </ww:form>
+ </div>
+ </div>
+</div>
+
+</body>
+</ww:i18n>
+</html>
\ No newline at end of file
Propchange: continuum/branches/CONTINUUM-782/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editPurgeConfiguration.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: continuum/branches/CONTINUUM-782/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editPurgeConfiguration.jsp
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: continuum/branches/CONTINUUM-782/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/localRepositoriesList.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-782/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/localRepositoriesList.jsp?rev=679588&view=auto
==============================================================================
--- continuum/branches/CONTINUUM-782/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/localRepositoriesList.jsp (added)
+++ continuum/branches/CONTINUUM-782/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/localRepositoriesList.jsp Thu Jul 24 15:31:19 2008
@@ -0,0 +1,100 @@
+<%--
+ ~ 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.
+ --%>
+
+<%@ taglib uri="/webwork" prefix="ww" %>
+<%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
+<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
+<html>
+ <ww:i18n name="localization.Continuum">
+ <head>
+ <title><ww:text name="repositories.page.title"/></title>
+ </head>
+ <body>
+ <div id="h3">
+ <h3><ww:text name="repositories.section.title"/></h3>
+ <c:if test="${!empty actionErrors}">
+ <div class="errormessage">
+ <c:forEach items="${actionErrors}" var="actionError">
+ <p><ww:text name="${actionError}"/></p>
+ </c:forEach>
+ </div>
+ </c:if>
+ <ww:set name="repositories" value="repositories" scope="request"/>
+ <ec:table items="repositories"
+ var="repository"
+ showExports="false"
+ showPagination="false"
+ showStatusBar="false"
+ sortable="false"
+ filterable="false">
+ <ec:row>
+ <ec:column property="name" title="repositories.table.name"/>
+ <ec:column property="location" title="repositories.table.location"/>
+ <ec:column property="layout" title="repositories.table.layout"/>
+ <ec:column property="editActions" title=" " width="1%">
+ <ww:url id="editRepositoryUrl" action="editRepository">
+ <ww:param name="repository.id" value="${pageScope.repository.id}"/>
+ </ww:url>
+ <c:choose>
+ <c:when test="${repository.name == 'DEFAULT'}">
+ <img src="<ww:url value='/images/edit_disabled.gif' includeParams="none"/>" alt="<ww:text name='edit'/>" title="<ww:text name='edit'/>" border="0" />
+ </c:when>
+ <c:otherwise>
+ <ww:a href="%{editRepositoryUrl}"><img src="<ww:url value='/images/edit.gif' includeParams="none"/>" alt="<ww:text name='edit'/>" title="<ww:text name='edit'/>" border="0" /></ww:a>
+ </c:otherwise>
+ </c:choose>
+ </ec:column>
+ <ec:column property="purgeActions" title=" " width="1%">
+ <c:set var="repositoryName" value="${pageScope.repository.name}" scope="request"/>
+ <c:choose>
+ <c:when test="${defaultPurgeMap[repositoryName]}">
+ <ww:url id="purgeRepositoryUrl" action="purgeRepository">
+ <ww:param name="repository.id" value="${pageScope.repository.id}"/>
+ </ww:url>
+ <ww:a href="%{purgeRepositoryUrl}"><img src="<ww:url value='/images/purgenow.gif' includeParams="none"/>" alt="<ww:text name='purge'/>" title="<ww:text name='purge'/>" border="0" /></ww:a>
+ </c:when>
+ <c:otherwise>
+ <ww:a href="%{purgeRepositoryUrl}"><img src="<ww:url value='/images/disabled_purgenow.gif' includeParams="none"/>" alt="<ww:text name='purge'/>" title="<ww:text name='purge'/>" border="0" /></ww:a>
+ </c:otherwise>
+ </c:choose>
+ </ec:column>
+ <ec:column property="deleteActions" title=" " width="1%">
+ <ww:url id="removeRepositoryUrl" action="removeRepository">
+ <ww:param name="repository.id" value="${pageScope.repository.id}"/>
+ </ww:url>
+ <c:choose>
+ <c:when test="${repository.name == 'DEFAULT'}">
+ <img src="<ww:url value='/images/delete_disabled.gif' includeParams="none"/>" alt="<ww:text name='delete'/>" title="<ww:text name='delete'/>" border="0">
+ </c:when>
+ <c:otherwise>
+ <ww:a href="%{removeRepositoryUrl}"><img src="<ww:url value='/images/delete.gif' includeParams="none"/>" alt="<ww:text name='delete'/>" title="<ww:text name='delete'/>" border="0"></ww:a>
+ </c:otherwise>
+ </c:choose>
+ </ec:column>
+ </ec:row>
+ </ec:table>
+ </div>
+ <div class="functnbar3">
+ <ww:form action="editRepository" method="post">
+ <ww:submit value="%{getText('add')}"/>
+ </ww:form>
+ </div>
+ </body>
+ </ww:i18n>
+</html>
Propchange: continuum/branches/CONTINUUM-782/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/localRepositoriesList.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: continuum/branches/CONTINUUM-782/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/localRepositoriesList.jsp
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: continuum/branches/CONTINUUM-782/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/purgeConfigurationsList.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-782/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/purgeConfigurationsList.jsp?rev=679588&view=auto
==============================================================================
--- continuum/branches/CONTINUUM-782/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/purgeConfigurationsList.jsp (added)
+++ continuum/branches/CONTINUUM-782/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/purgeConfigurationsList.jsp Thu Jul 24 15:31:19 2008
@@ -0,0 +1,145 @@
+<%--
+ ~ 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.
+ --%>
+
+<%@ taglib uri="/webwork" prefix="ww" %>
+<%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
+<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
+<%@ taglib uri="continuum" prefix="c1" %>
+<%@ taglib uri="http://plexus.codehaus.org/redback/taglib-1.0" prefix="redback" %>
+
+<html>
+ <ww:i18n name="localization.Continuum">
+ <head>
+ <title><ww:text name="purgeConfigs.page.title"/></title>
+ </head>
+ <body>
+ <div id="h3">
+ <h3><ww:text name="purgeConfigs.repo.section.title"/></h3>
+ <c:if test="${!empty actionErrors}">
+ <div class="errormessage">
+ <c:forEach items="${actionErrors}" var="actionError">
+ <p><ww:text name="${actionError}"/></p>
+ </c:forEach>
+ </div>
+ </c:if>
+ <ww:set name="repoPurgeConfigs" value="repoPurgeConfigs" scope="request"/>
+ <ec:table items="repoPurgeConfigs"
+ var="repoPurge"
+ showExports="false"
+ showPagination="false"
+ showStatusBar="false"
+ sortable="false"
+ filterable="false">
+ <ec:row>
+ <ec:column property="repository.name" title="purgeConfigs.table.repository">
+ <redback:ifAuthorized permission="continuum-manage-repositories">
+ <ww:url id="editRepositoryUrl" action="editRepository" namespace="/admin" includeParams="none">
+ <ww:param name="repository.id">${pageScope.repoPurge.repository.id}</ww:param>
+ </ww:url>
+ <ww:a href="%{editRepositoryUrl}">${pageScope.repoPurge.repository.name}</ww:a>
+ </redback:ifAuthorized>
+ <redback:elseAuthorized>
+ ${pageScope.repoPurge.repository.name}
+ </redback:elseAuthorized>
+ </ec:column>
+ <ec:column property="daysOlder" title="purgeConfigs.table.daysOlder"/>
+ <ec:column property="retentionCount" title="purgeConfigs.table.retentionCount"/>
+ <ec:column property="deleteAll" title="purgeConfigs.table.deleteAll"/>
+ <ec:column property="deleteReleasedSnapshots" title="purgeConfigs.table.deleteReleasedSnapshots"/>
+ <ec:column property="schedule.name" title="purgeConfigs.table.schedule"/>
+ <ec:column property="defaultPurge" title="purgeConfigs.table.default"/>
+ <ec:column property="enabled" title="purgeConfigs.table.enabled"/>
+ <ec:column property="description" title="purgeConfigs.table.description"/>
+ <ec:column property="editActions" title=" " width="1%">
+ <ww:url id="editPurgeConfigUrl" action="editPurgeConfig">
+ <ww:param name="purgeConfigId" value="${pageScope.repoPurge.id}"/>
+ </ww:url>
+ <ww:a href="%{editPurgeConfigUrl}"><img src="<ww:url value='/images/edit.gif' includeParams="none"/>" alt="<ww:text name='edit'/>" title="<ww:text name='edit'/>" border="0" /></ww:a>
+ </ec:column>
+ <ec:column property="purgeActions" title=" " width="1%">
+ <ww:url id="purgeUrl" action="doPurge">
+ <ww:param name="purgeConfigId" value="${pageScope.repoPurge.id}"/>
+ </ww:url>
+ <ww:a href="%{purgeUrl}"><img src="<ww:url value='/images/purgenow.gif' includeParams="none"/>" alt="<ww:text name='purge'/>" title="<ww:text name='purge'/>" border="0" /></ww:a>
+ </ec:column>
+ <ec:column property="deleteActions" title=" " width="1%">
+ <ww:url id="removePurgeConfigUrl" action="removePurgeConfig">
+ <ww:param name="purgeConfigId" value="${pageScope.repoPurge.id}"/>
+ </ww:url>
+ <ww:a href="%{removePurgeConfigUrl}"><img src="<ww:url value='/images/delete.gif' includeParams="none"/>" alt="<ww:text name='delete'/>" title="<ww:text name='delete'/>" border="0"></ww:a>
+ </ec:column>
+ </ec:row>
+ </ec:table>
+ </div>
+ <div class="functnbar3">
+ <ww:form name="addRepoPurgeConfig" action="editPurgeConfig" method="post">
+ <ww:hidden name="purgeType" value="repository"/>
+ <ww:submit value="%{getText('add')}"/>
+ </ww:form>
+ </div>
+
+ <div id="h3">
+ <h3><ww:text name="purgeConfigs.dir.section.title"/></h3>
+ <ww:set name="dirPurgeConfigs" value="dirPurgeConfigs" scope="request"/>
+ <ec:table items="dirPurgeConfigs"
+ var="dirPurge"
+ showExports="false"
+ showPagination="false"
+ showStatusBar="false"
+ sortable="false"
+ filterable="false">
+ <ec:row>
+ <ec:column property="directoryType" title="purgeConfigs.table.directoryType"/>
+ <ec:column property="daysOlder" title="purgeConfigs.table.daysOlder"/>
+ <ec:column property="retentionCount" title="purgeConfigs.table.retentionCount"/>
+ <ec:column property="deleteAll" title="purgeConfigs.table.deleteAll"/>
+ <ec:column property="schedule.name" title="purgeConfigs.table.schedule"/>
+ <ec:column property="defaultPurge" title="purgeConfigs.table.default"/>
+ <ec:column property="enabled" title="purgeConfigs.table.enabled"/>
+ <ec:column property="description" title="purgeConfigs.table.description"/>
+ <ec:column property="editActions" title=" " width="1%">
+ <ww:url id="editPurgeConfigUrl" action="editPurgeConfig">
+ <ww:param name="purgeConfigId" value="${pageScope.dirPurge.id}"/>
+ </ww:url>
+ <ww:a href="%{editPurgeConfigUrl}"><img src="<ww:url value='/images/edit.gif' includeParams="none"/>" alt="<ww:text name='edit'/>" title="<ww:text name='edit'/>" border="0" /></ww:a>
+ </ec:column>
+ <ec:column property="purgeActions" title=" " width="1%">
+ <ww:url id="purgeUrl" action="doPurge">
+ <ww:param name="purgeConfigId" value="${pageScope.dirPurge.id}"/>
+ </ww:url>
+ <ww:a href="%{purgeUrl}"><img src="<ww:url value='/images/purgenow.gif' includeParams="none"/>" alt="<ww:text name='purge'/>" title="<ww:text name='purge'/>" border="0" /></ww:a>
+ </ec:column>
+ <ec:column property="deleteActions" title=" " width="1%">
+ <ww:url id="removePurgeConfigUrl" action="removePurgeConfig">
+ <ww:param name="purgeConfigId" value="${pageScope.dirPurge.id}"/>
+ </ww:url>
+ <ww:a href="%{removePurgeConfigUrl}"><img src="<ww:url value='/images/delete.gif' includeParams="none"/>" alt="<ww:text name='delete'/>" title="<ww:text name='delete'/>" border="0"></ww:a>
+ </ec:column>
+ </ec:row>
+ </ec:table>
+ </div>
+ <div class="functnbar3">
+ <ww:form name="addDirPurgeConfig" action="editPurgeConfig" method="post">
+ <ww:hidden name="purgeType" value="directory"/>
+ <ww:submit value="%{getText('add')}"/>
+ </ww:form>
+ </div>
+ </body>
+ </ww:i18n>
+</html>
\ No newline at end of file
Propchange: continuum/branches/CONTINUUM-782/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/purgeConfigurationsList.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: continuum/branches/CONTINUUM-782/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/purgeConfigurationsList.jsp
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Modified: continuum/branches/CONTINUUM-782/continuum-webapp/src/main/webapp/WEB-INF/jsp/groupSummary.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-782/continuum-webapp/src/main/webapp/WEB-INF/jsp/groupSummary.jsp?rev=679588&r1=679587&r2=679588&view=diff
==============================================================================
--- continuum/branches/CONTINUUM-782/continuum-webapp/src/main/webapp/WEB-INF/jsp/groupSummary.jsp (original)
+++ continuum/branches/CONTINUUM-782/continuum-webapp/src/main/webapp/WEB-INF/jsp/groupSummary.jsp Thu Jul 24 15:31:19 2008
@@ -57,6 +57,17 @@
<a href="<ww:url action="projectGroupSummary" namespace="/"><ww:param name="projectGroupId" value="%{'${group.id}'}"/></ww:url>">${group.name}</a>
</ec:column>
<ec:column property="groupId" title="groups.table.groupId" width="20%"/>
+ <ec:column property="repositoryName" title="groups.table.repositoryName" width="20%">
+ <redback:ifAuthorized permission="continuum-manage-repositories">
+ <ww:url id="editRepositoryUrl" action="editRepository" namespace="/admin" includeParams="none">
+ <ww:param name="repository.id">${pageScope.group.repositoryId}</ww:param>
+ </ww:url>
+ <ww:a href="%{editRepositoryUrl}">${pageScope.group.repositoryName}</ww:a>
+ </redback:ifAuthorized>
+ <redback:elseAuthorized>
+ ${pageScope.group.repositoryName}
+ </redback:elseAuthorized>
+ </ec:column>
<ec:column property="numSuccesses" title=" " format="0" width="2%" style="text-align: right" headerClass="calcHeaderSucces" calc="total" calcTitle="groups.table.summary"/>
<ec:column property="numFailures" title=" " format="0" width="2%" style="text-align: right" headerClass="calcHeaderFailure" calc="total" />
<ec:column property="numErrors" title=" " format="0" width="2%" style="text-align: right" headerClass="calcHeaderError" calc="total"/>
Modified: continuum/branches/CONTINUUM-782/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/Menu.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-782/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/Menu.jsp?rev=679588&r1=679587&r2=679588&view=diff
==============================================================================
--- continuum/branches/CONTINUUM-782/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/Menu.jsp (original)
+++ continuum/branches/CONTINUUM-782/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/Menu.jsp Thu Jul 24 15:31:19 2008
@@ -82,12 +82,28 @@
</redback:ifAuthorized>
- <redback:ifAnyAuthorized permissions="continuum-manage-build-templates,continuum-manage-schedules,continuum-manage-configuration,continuum-manage-users,continuum-manage-installations,continuum-manage-profiles,continuum-view-queues">
+ <redback:ifAnyAuthorized permissions="continuum-manage-build-templates,continuum-manage-schedules,continuum-manage-configuration,continuum-manage-users,continuum-manage-installations,continuum-manage-profiles,continuum-view-queues,continuum-manage-repositories,continuum-manage-purging">
<div id="projectmenu" class="toolgroup">
<div class="label">
<ww:text name="menu.administration"/>
</div>
<div>
+ <redback:ifAuthorized permission="continuum-manage-repositories">
+ <ww:url id="repositoryListUrl" action="repositoryList" namespace="/admin" includeParams="none"/>
+ <div class="body">
+ <ww:a href="%{repositoryListUrl}">
+ <ww:text name="menu.administration.repositories"/>
+ </ww:a>
+ </div>
+ </redback:ifAuthorized>
+ <redback:ifAuthorized permission="continuum-manage-purging">
+ <ww:url id="purgeConfigListUrl" action="purgeConfigList" namespace="/admin" includeParams="none"/>
+ <div class="body">
+ <ww:a href="%{purgeConfigListUrl}">
+ <ww:text name="menu.administration.purge"/>
+ </ww:a>
+ </div>
+ </redback:ifAuthorized>
<redback:ifAuthorized permission="continuum-manage-schedules">
<ww:url id="scheduleUrl" namespace="/" action="schedules" includeParams="none"/>
<div class="body">
Modified: continuum/branches/CONTINUUM-782/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupAdd.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-782/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupAdd.jsp?rev=679588&r1=679587&r2=679588&view=diff
==============================================================================
--- continuum/branches/CONTINUUM-782/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupAdd.jsp (original)
+++ continuum/branches/CONTINUUM-782/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupAdd.jsp Thu Jul 24 15:31:19 2008
@@ -44,6 +44,8 @@
<ww:textfield label="%{getText('projectGroup.name.label')}" name="name" required="true"/>
<ww:textfield label="%{getText('projectGroup.groupId.label')}" name="groupId" required="true"/>
<ww:textfield label="%{getText('projectGroup.description.label')}" name="description"/>
+ <ww:select label="%{getText('projectGroup.repository.label')}" name="repositoryId" list="repositories"
+ listKey="id" listValue="name"/>
</tbody>
</table>
<div class="functnbar3">
Modified: continuum/branches/CONTINUUM-782/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupEdit.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-782/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupEdit.jsp?rev=679588&r1=679587&r2=679588&view=diff
==============================================================================
--- continuum/branches/CONTINUUM-782/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupEdit.jsp (original)
+++ continuum/branches/CONTINUUM-782/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupEdit.jsp Thu Jul 24 15:31:19 2008
@@ -50,6 +50,8 @@
<ww:textfield label="%{getText('projectGroup.name.label')}" name="name" required="true" disabled="%{projectInCOQueue}"/>
<c1:data label="%{getText('projectGroup.groupId.label')}" name="projectGroup.groupId"/>
<ww:textfield label="%{getText('projectGroup.description.label')}" name="description" disabled="%{projectInCOQueue}"/>
+ <ww:select label="%{getText('projectGroup.repository.label')}" name="repositoryId" list="repositories"
+ listKey="id" listValue="name"/>
</tbody>
</table>
Modified: continuum/branches/CONTINUUM-782/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupSummary.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-782/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupSummary.jsp?rev=679588&r1=679587&r2=679588&view=diff
==============================================================================
--- continuum/branches/CONTINUUM-782/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupSummary.jsp (original)
+++ continuum/branches/CONTINUUM-782/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupSummary.jsp Thu Jul 24 15:31:19 2008
@@ -88,6 +88,7 @@
<c1:data label="%{getText('projectGroup.name.label')}" name="projectGroup.name"/>
<c1:data label="%{getText('projectGroup.groupId.label')}" name="projectGroup.groupId"/>
<c1:data label="%{getText('projectGroup.description.label')}" name="projectGroup.description"/>
+ <c1:data label="%{getText('projectGroup.repository.label')}" name="projectGroup.localRepository.name"/>
<c:if test="${url != null}">
<ww:url id="projectHomepageUrl" value="${url}" includeContext="false" includeParams="none"/>
<c1:data label="%{getText('projectGroup.url.label')}" name="url" valueLink="%{'${projectHomepageUrl}'}"/>
Modified: continuum/branches/CONTINUUM-782/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-782/pom.xml?rev=679588&r1=679587&r2=679588&view=diff
==============================================================================
--- continuum/branches/CONTINUUM-782/pom.xml (original)
+++ continuum/branches/CONTINUUM-782/pom.xml Thu Jul 24 15:31:19 2008
@@ -170,6 +170,7 @@
<module>maven-continuum-plugin</module>
<module>continuum-docs</module>
<module>continuum-jetty</module>
+ <module>continuum-purge</module>
</modules>
<repositories>
<repository>
@@ -861,6 +862,21 @@
<artifactId>spring-web</artifactId>
<version>${spring.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.continuum</groupId>
+ <artifactId>continuum-purge</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.archiva</groupId>
+ <artifactId>archiva-common</artifactId>
+ <version>${archiva.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.archiva</groupId>
+ <artifactId>archiva-repository-layer</artifactId>
+ <version>${archiva.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
@@ -910,5 +926,6 @@
<maven-scm.version>1.1-SNAPSHOT</maven-scm.version>
<redback.version>1.0.2</redback.version>
<mail-sender.version>1.0-alpha-7</mail-sender.version>
+ <archiva.version>1.1</archiva.version>
</properties>
</project>