You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by br...@apache.org on 2006/12/01 07:26:17 UTC
svn commit: r481166 [2/2] - in /maven/continuum/trunk: ./
continuum-api/src/main/java/org/apache/maven/continuum/configuration/
continuum-api/src/main/java/org/apache/maven/continuum/store/
continuum-configuration/ continuum-configuration/src/ continuu...
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?view=diff&rev=481166&r1=481165&r2=481166
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml Thu Nov 30 22:26:12 2006
@@ -3,8 +3,8 @@
<xwork>
<include file="webwork-default.xml"/>
- <!-- Include plexus-security xwork configurations. -->
- <include file="xwork-security.xml" />
+ <!-- Include plexus-security xwork configurations. -->
+ <include file="xwork-security.xml"/>
<package name="default" extends="webwork-default">
@@ -16,7 +16,7 @@
<interceptor name="pssSecureActions" class="pssSecureActionInterceptor"/>
<interceptor name="pssAutoLogin" class="pssAutoLoginInterceptor"/>
<interceptor name="pssEnvironmentChecker" class="pssEnvironmentCheckInterceptor"/>
-
+
<interceptor-stack name="configuredContinuumStack">
<interceptor-ref name="defaultStack"/>
<interceptor-ref name="exception-logging"/>
@@ -56,14 +56,14 @@
<result name="error">/WEB-INF/jsp/error.jsp</result>
<result name="internal-error">/WEB-INF/jsp/error.jsp</result>
<result name="internalError" type="redirect">/WEB-INF/jsp/error.jsp</result>
-
+
<result name="continuum-configuration-required" type="redirect-action">
<param name="actionName">configuration</param>
<param name="namespace">/admin</param>
<param name="method">input</param>
</result>
- <!-- The following security-* result names arrive from the plexus-security package -->
+ <!-- The following security-* result names arrive from the plexus-security package -->
<result name="security-login-success" type="redirect-action">
<param name="actionName">groupSummary</param>
<param name="namespace">/</param>
@@ -75,7 +75,7 @@
<result name="security-login-locked" type="redirect-action">
<param name="actionName">groupSummary</param>
<param name="namespace">/</param>
- <param name="infoMessage">Account Locked</param>
+ <param name="infoMessage">Account Locked</param>
</result>
<result name="security-logout" type="redirect-action">
<param name="actionName">groupSummary</param>
@@ -112,8 +112,11 @@
</global-results>
<global-exception-mappings>
- <exception-mapping exception="org.apache.maven.continuum.initialization.ContinuumInitializationException" result="continuumInitialization"/>
- <exception-mapping exception="java.lang.Exception" result="error-internal"/>
+ <exception-mapping exception="org.apache.maven.continuum.initialization.ContinuumInitializationException"
+ result="continuumInitialization"/>
+ <!-- TODO: this is missing
+ <exception-mapping exception="java.lang.Exception" result="error-internal"/>
+ -->
</global-exception-mappings>
<!-- This is the redirection facility for plexus-security,
@@ -128,7 +131,7 @@
</action>
-
+ <!-- TODO! -->
<action name="companyInfo" class="configuration">
<result name="success">/WEB-INF/jsp/components/companyLogo.jsp</result>
</action>
@@ -246,16 +249,16 @@
<param name="actionName">groupSummary</param>
</result>
</action>
-
+
<action name="addProjectGroup" class="addProjectGroup">
<result name="input">/WEB-INF/jsp/projectGroupAdd.jsp</result>
<result name="success" type="chain">groupSummary</result>
</action>
-
+
<action name="editProjectGroup" class="projectGroup" method="edit">
- <result name="success">/WEB-INF/jsp/projectGroupEdit.jsp</result>
+ <result name="success">/WEB-INF/jsp/projectGroupEdit.jsp</result>
</action>
-
+
<action name="saveProjectGroup" class="projectGroup" method="save">
<result name="success" type="chain">projectGroupSummary</result>
<result name="input">/WEB-INF/jsp/projectGroupEdit.jsp</result>
@@ -276,14 +279,14 @@
<result name="msn_input">/WEB-INF/jsp/notifierMsn.jsp</result>
<result name="jabber_input">/WEB-INF/jsp/notifierJabber.jsp</result>
</action>
-
- <action name="editProjectNotifier" class="addProjectNotifier">
+
+ <action name="editProjectNotifier" class="addProjectNotifier">
<result name="mail_input" type="chain">mailProjectNotifierEdit</result>
<result name="irc_input" type="chain">ircProjectNotifierEdit</result>
<result name="msn_input" type="chain">msnProjectNotifierEdit</result>
<result name="jabber_input" type="chain">jabberProjectNotifierEdit</result>
</action>
-
+
<action name="mailProjectNotifierEdit" class="mailProjectNotifierEdit" method="edit">
<result name="success">/WEB-INF/jsp/notifierMail.jsp</result>
</action>
@@ -323,7 +326,7 @@
<!--
* notifier actions :: Project Group
-->
-
+
<action name="deleteProjectGroupNotifier" class="deleteGroupNotifier">
<result name="delete">/WEB-INF/jsp/deleteNotifier.jsp</result>
<result name="success" type="chain">projectGroupNotifier</result>
@@ -336,21 +339,21 @@
<result name="msn_input">/WEB-INF/jsp/notifierMsn.jsp</result>
<result name="jabber_input">/WEB-INF/jsp/notifierJabber.jsp</result>
</action>
-
+
<action name="editProjectGroupNotifier" class="addGroupNotifier">
<result name="mail_input" type="chain">mailProjectGroupNotifierEdit</result>
<result name="irc_input" type="chain">ircProjectGroupNotifierEdit</result>
<result name="msn_input" type="chain">msnProjectGroupNotifierEdit</result>
<result name="jabber_input" type="chain">jabberProjectGroupNotifierEdit</result>
</action>
-
+
<action name="mailProjectGroupNotifierEdit" class="mailGroupNotifierEdit" method="edit">
<result name="success">/WEB-INF/jsp/notifierMail.jsp</result>
</action>
<action name="mailProjectGroupNotifierSave" class="mailGroupNotifierEdit" method="save">
<result name="input">/WEB-INF/jsp/notifierMail.jsp</result>
- <result name="success" type="chain">projectGroupNotifier</result>
+ <result name="success" type="chain">projectGroupNotifier</result>
</action>
<action name="ircProjectGroupNotifierEdit" class="ircGroupNotifierEdit" method="edit">
@@ -523,6 +526,21 @@
<result name="success">/WEB-INF/jsp/admin/configuration.jsp</result>
</action>
+ <action name="configureAppearance" class="configureAppearance" method="input">
+ <result name="input">/WEB-INF/jsp/admin/appearance.jsp</result>
+ </action>
+
+ <action name="editAppearance" class="configureAppearance" method="input">
+ <result name="input">/WEB-INF/jsp/admin/editAppearance.jsp</result>
+ </action>
+
+ <action name="saveAppearance" class="configureAppearance">
+ <result name="input">/WEB-INF/jsp/admin/editAppearance.jsp</result>
+ <result type="redirect-action">
+ <param name="actionName">configureAppearance</param>
+ <param name="namespace">/admin</param>
+ </result>
+ </action>
</package>
<package name="component" extends="default">
@@ -548,16 +566,16 @@
<result name="success">/WEB-INF/jsp/components/projectSummaryComponent.jsp</result>
<result name="error">/WEB-INF/jsp/components/failureComponent.jsp</result>
</action>
-
+
<action name="projectNotifierSummary" class="notifierSummary" method="summarizeForProject">
- <result name="success">/WEB-INF/jsp/components/projectNotifierSummaryComponent.jsp</result>
- <result name="error">/WEB-INF/jsp/components/failureComponent.jsp</result>
+ <result name="success">/WEB-INF/jsp/components/projectNotifierSummaryComponent.jsp</result>
+ <result name="error">/WEB-INF/jsp/components/failureComponent.jsp</result>
</action>
-
+
<action name="projectGroupNotifierSummary" class="notifierSummary" method="summarizeForProjectGroup">
- <result name="success">/WEB-INF/jsp/components/projectGroupNotifierSummaryComponent.jsp</result>
- <result name="error">/WEB-INF/jsp/components/failureComponent.jsp</result>
+ <result name="success">/WEB-INF/jsp/components/projectGroupNotifierSummaryComponent.jsp</result>
+ <result name="error">/WEB-INF/jsp/components/failureComponent.jsp</result>
</action>
-
+
</package>
</xwork>
Added: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp?view=auto&rev=481166
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp (added)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp Thu Nov 30 22:26:12 2006
@@ -0,0 +1,71 @@
+<%--
+ ~ 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 prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<html>
+<head>
+ <title>Configure Appearance</title>
+ <ww:head/>
+</head>
+
+<body>
+<h1>Appearance</h1>
+
+<div style="float: right">
+ <a href="<ww:url action='editAppearance' />">Edit</a>
+</div>
+<h2>Company Details</h2>
+
+<table>
+ <ww:label name="companyPom.groupId" label="Group ID"/>
+ <ww:label name="companyPom.artifactId" label="Artifact ID"/>
+</table>
+
+<div style="float: right">
+ <a href="<ww:url action='editCompanyPom' />">Edit Company POM</a>
+</div>
+<h3>POM Information</h3>
+
+<ww:actionmessage/>
+<ww:set name="companyModel" value="companyModel"/>
+
+<c:if test="${companyModel}">
+ <table>
+ <tr>
+ <th>Name</th>
+ <td>${companyModel.organization.name}</td>
+ </tr>
+ <tr>
+ <th>URL</th>
+ <td><a href="${companyModel.organization.url}">
+ <code>${companyModel.organization.name}</code>
+ </a></td>
+ </tr>
+ <tr>
+ <th>Logo URL</th>
+ <td>
+ <code>${companyModel.properties['organization.logo']}</code>
+ </td>
+ </tr>
+ </table>
+</c:if>
+</body>
+
+</html>
\ No newline at end of file
Propchange: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/configuration.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/configuration.jsp?view=diff&rev=481166&r1=481165&r2=481166
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/configuration.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/configuration.jsp Thu Nov 30 22:26:12 2006
@@ -1,31 +1,33 @@
<%@ taglib uri="/webwork" prefix="ww" %>
<%@ taglib uri="continuum" prefix="c1" %>
<html>
- <ww:i18n name="localization.Continuum">
- <head>
- <title><ww:text name="configuration.page.title"/></title>
- </head>
- <body>
- <div id="axial" class="h3">
- <h3><ww:text name="configuration.section.title"/></h3>
+<ww:i18n name="localization.Continuum">
+ <head>
+ <title>
+ <ww:text name="configuration.page.title"/>
+ </title>
+ </head>
+ <body>
+ <div id="axial" class="h3">
+ <h3>
+ <ww:text name="configuration.section.title"/>
+ </h3>
- <div class="axial">
- <table border="1" cellspacing="2" cellpadding="3" width="100%">
- <c1:data label="%{getText('configuration.workingDirectory.label')}" name="workingDirectory"/>
- <c1:data label="%{getText('configuration.buildOutputDirectory.label')}" name="buildOutputDirectory"/>
- <c1:data label="%{getText('configuration.deploymentRepositoryDirectory.label')}" name="deploymentRepositoryDirectory"/>
- <c1:data label="%{getText('configuration.baseUrl.label')}" name="baseUrl"/>
- <c1:data label="%{getText('configuration.companyName.label')}" name="companyName"/>
- <c1:data label="%{getText('configuration.companyLogo.label')}" name="companyLogo"/>
- <c1:data label="%{getText('configuration.companyUrl.label')}" name="companyUrl"/>
- </table>
- <div class="functnbar3">
- <ww:form action="configuration!input.action" method="post">
- <ww:submit value="%{getText('edit')}"/>
- </ww:form>
- </div>
- </div>
+ <div class="axial">
+ <table border="1" cellspacing="2" cellpadding="3" width="100%">
+ <c1:data label="%{getText('configuration.workingDirectory.label')}" name="workingDirectory"/>
+ <c1:data label="%{getText('configuration.buildOutputDirectory.label')}" name="buildOutputDirectory"/>
+ <c1:data label="%{getText('configuration.deploymentRepositoryDirectory.label')}"
+ name="deploymentRepositoryDirectory"/>
+ <c1:data label="%{getText('configuration.baseUrl.label')}" name="baseUrl"/>
+ </table>
+ <div class="functnbar3">
+ <ww:form action="configuration!input.action" method="post">
+ <ww:submit value="%{getText('edit')}"/>
+ </ww:form>
</div>
- </body>
- </ww:i18n>
+ </div>
+ </div>
+ </body>
+</ww:i18n>
</html>
Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/configurationEdit.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/configurationEdit.jsp?view=diff&rev=481166&r1=481165&r2=481166
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/configurationEdit.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/configurationEdit.jsp Thu Nov 30 22:26:12 2006
@@ -3,12 +3,16 @@
<html>
<ww:i18n name="localization.Continuum">
<head>
- <title><ww:text name="configuration.page.title"/></title>
+ <title>
+ <ww:text name="configuration.page.title"/>
+ </title>
</head>
<body>
<div id="axial" class="h3">
- <h3><ww:text name="configuration.section.title"/></h3>
+ <h3>
+ <ww:text name="configuration.section.title"/>
+ </h3>
<ww:form action="configuration!save" method="post">
@@ -26,34 +30,31 @@
<ww:textfield label="%{getText('configuration.workingDirectory.label')}" name="workingDirectory"
required="true">
- <ww:param name="desc"><p><ww:text name="configuration.workingDirectory.message"/></p></ww:param>
+ <ww:param name="desc"><p>
+ <ww:text name="configuration.workingDirectory.message"/>
+ </p></ww:param>
</ww:textfield>
<ww:textfield label="%{getText('configuration.buildOutputDirectory.label')}" name="buildOutputDirectory"
required="true">
- <ww:param name="desc"><p><ww:text name="configuration.buildOutputDirectory.message"/></p></ww:param>
+ <ww:param name="desc"><p>
+ <ww:text name="configuration.buildOutputDirectory.message"/>
+ </p></ww:param>
</ww:textfield>
- <ww:textfield label="%{getText('configuration.deploymentRepositoryDirectory.label')}" name="deploymentRepositoryDirectory">
- <ww:param name="desc"><p><ww:text name="configuration.deploymentRepositoryDirectory.message"/></p></ww:param>
+ <ww:textfield label="%{getText('configuration.deploymentRepositoryDirectory.label')}"
+ name="deploymentRepositoryDirectory">
+ <ww:param name="desc"><p>
+ <ww:text name="configuration.deploymentRepositoryDirectory.message"/>
+ </p></ww:param>
</ww:textfield>
<ww:textfield label="%{getText('configuration.baseUrl.label')}" name="baseUrl" required="true">
- <ww:param name="desc"><p><ww:text name="configuration.baseUrl.message"/></p></ww:param>
+ <ww:param name="desc"><p>
+ <ww:text name="configuration.baseUrl.message"/>
+ </p></ww:param>
</ww:textfield>
- <ww:textfield label="%{getText('configuration.companyName.label')}" name="companyName">
- <ww:param name="desc"><p><ww:text name="configuration.companyName.message"/></p></ww:param>
- </ww:textfield>
-
- <ww:textfield label="%{getText('configuration.companyLogo.label')}" name="companyLogo">
- <ww:param name="desc"><p><ww:text name="configuration.companyLogo.message"/></p></ww:param>
- </ww:textfield>
-
- <ww:textfield label="%{getText('configuration.companyUrl.label')}" name="companyUrl">
- <ww:param name="desc"><p><ww:text name="configuration.companyUrl.message"/></p></ww:param>
- </ww:textfield>
-
</tbody>
</table>
<div class="functnbar3">
Added: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editAppearance.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editAppearance.jsp?view=auto&rev=481166
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editAppearance.jsp (added)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editAppearance.jsp Thu Nov 30 22:26:12 2006
@@ -0,0 +1,45 @@
+<%--
+ ~ 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 prefix="ww" uri="/webwork" %>
+<html>
+<head>
+ <title>Configure Appearance</title>
+ <ww:head/>
+</head>
+
+<body>
+<h1>Appearance</h1>
+
+<h2>Company Details</h2>
+
+<p>
+ Enter the details of the company super POM below. If it exists, the organization name, URL and logo will be read
+ from it.
+</p>
+
+<ww:actionmessage/>
+<ww:form method="post" action="saveAppearance" namespace="/admin" validate="true" theme="xhtml">
+ <ww:textfield name="companyPom.groupId" label="Group ID"/>
+ <ww:textfield name="companyPom.artifactId" label="Artifact ID"/>
+ <ww:submit value="Save"/>
+</ww:form>
+</body>
+
+</html>
\ No newline at end of file
Propchange: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editAppearance.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp?view=diff&rev=481166&r1=481165&r2=481166
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp Thu Nov 30 22:26:12 2006
@@ -2,39 +2,42 @@
<%@ taglib uri="/webwork" prefix="ww" %>
<html>
- <head>
- <title><decorator:title/></title>
- <link rel="stylesheet" type="text/css" href="<ww:url value="/css/tigris.css"/>" media="screen" />
- <link rel="stylesheet" type="text/css" href="<ww:url value="/css/print.css"/>" media="print" />
- <link rel="stylesheet" type="text/css" href="<ww:url value="/css/extremecomponents.css"/>" media="screen" />
- <link rel="shortcut icon" href="<ww:url value="/favicon.ico"/>" type="image/x-icon"/>
+<head>
+ <title>
+ <decorator:title/>
+ </title>
+ <link rel="stylesheet" type="text/css" href="<ww:url value="/css/tigris.css"/>" media="screen"/>
+ <link rel="stylesheet" type="text/css" href="<ww:url value="/css/print.css"/>" media="print"/>
+ <link rel="stylesheet" type="text/css" href="<ww:url value="/css/extremecomponents.css"/>" media="screen"/>
+ <link rel="shortcut icon" href="<ww:url value="/favicon.ico"/>" type="image/x-icon"/>
- <script src="<ww:url value="/scripts/tigris.js"/>" type="text/javascript"></script>
- <decorator:head/>
- </head>
+ <script src="<ww:url value="/scripts/tigris.js"/>" type="text/javascript"></script>
+ <decorator:head/>
+</head>
- <body onload="focus()" marginwidth="0" marginheight="0" class="composite">
- <ww:include value="/WEB-INF/jsp/navigations/DefaultTop.jsp"/>
+<body onload="focus()" marginwidth="0" marginheight="0" class="composite">
+<%@ include file="/WEB-INF/jsp/navigations/DefaultTop.jsp" %>
- <table id="main" border="0" cellpadding="4" cellspacing="0" width="100%">
- <tbody>
- <tr valign="top">
- <td id="leftcol" width="180">
- <br /> <br />
- <ww:include value="/WEB-INF/jsp/navigations/Menu.jsp"/>
- </td>
- <td width="86%">
- <br />
- <div id="bodycol">
- <div class="app">
- <decorator:body/>
- </div>
- </div>
- </td>
- </tr>
- </tbody>
- </table>
+<table id="main" border="0" cellpadding="4" cellspacing="0" width="100%">
+ <tbody>
+ <tr valign="top">
+ <td id="leftcol" width="180">
+ <br/> <br/>
+ <%@ include file="/WEB-INF/jsp/navigations/Menu.jsp" %>
+ </td>
+ <td width="86%">
+ <br/>
- <ww:include value="/WEB-INF/jsp/navigations/DefaultBottom.jsp"/>
- </body>
+ <div id="bodycol">
+ <div class="app">
+ <decorator:body/>
+ </div>
+ </div>
+ </td>
+ </tr>
+ </tbody>
+</table>
+
+<%@ include file="/WEB-INF/jsp/navigations/DefaultBottom.jsp" %>
+</body>
</html>
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?view=diff&rev=481166&r1=481165&r2=481166
==============================================================================
--- 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 Thu Nov 30 22:26:12 2006
@@ -3,83 +3,115 @@
<%@ taglib uri="/plexusSecuritySystem" prefix="pss" %>
<ww:i18n name="localization.Continuum">
-<div id="navcolum">
+ <div id="navcolum">
<div id="projectmenu" class="toolgroup">
<div class="label">Continuum</div>
<div>
<div class="body">
<ww:url id="aboutUrl" action="about" namespace="/" includeParams="none"/>
- <ww:a href="%{aboutUrl}"><ww:text name="menu.continuum.about"/></ww:a>
+ <ww:a href="%{aboutUrl}">
+ <ww:text name="menu.continuum.about"/>
+ </ww:a>
</div>
<div class="body">
<ww:url id="groupSummaryUrl" action="groupSummary" namespace="/" includeParams="none"/>
- <ww:a href="%{groupSummaryUrl}"><ww:text name="menu.continuum.showProjectGroups"/></ww:a>
+ <ww:a href="%{groupSummaryUrl}">
+ <ww:text name="menu.continuum.showProjectGroups"/>
+ </ww:a>
</div>
</div>
</div>
<pss:ifAuthorized permission="continuum-add-group">
- <div id="projectmenu" class="toolgroup">
- <div class="label"><ww:text name="menu.addProject"/></div>
- <div>
- <div class="body">
- <ww:url id="addMavenTwoProjectUrl" action="addMavenTwoProject" method="default" namespace="/" includeParams="none"/>
- <ww:a href="%{addMavenTwoProjectUrl}"><ww:text name="menu.add.m2Project"/></ww:a>
- </div>
- <div class="body">
- <ww:url id="addMavenOneProjectUrl" action="addMavenOneProject" method="default" namespace="/" includeParams="none"/>
- <ww:a href="%{addMavenOneProjectUrl}"><ww:text name="menu.add.m1Project"/></ww:a>
- </div>
- <div class="body">
- <ww:url id="addAntProjectUrl" action="addProjectInput" namespace="/" includeParams="none">
- <ww:param name="projectType">ant</ww:param>
- </ww:url>
- <ww:a href="%{addAntProjectUrl}"><ww:text name="menu.add.antProject"/></ww:a>
- </div>
- <div class="body">
- <ww:url id="addShellProjectUrl" action="addProjectInput" namespace="/" includeParams="none">
- <ww:param name="projectType">shell</ww:param>
- </ww:url>
- <ww:a href="%{addShellProjectUrl}"><ww:text name="menu.add.shellProject"/></ww:a>
- </div>
+ <div id="projectmenu" class="toolgroup">
+ <div class="label">
+ <ww:text name="menu.addProject"/>
+ </div>
+ <div>
+ <div class="body">
+ <ww:url id="addMavenTwoProjectUrl" action="addMavenTwoProject" method="default" namespace="/"
+ includeParams="none"/>
+ <ww:a href="%{addMavenTwoProjectUrl}">
+ <ww:text name="menu.add.m2Project"/>
+ </ww:a>
+ </div>
+ <div class="body">
+ <ww:url id="addMavenOneProjectUrl" action="addMavenOneProject" method="default" namespace="/"
+ includeParams="none"/>
+ <ww:a href="%{addMavenOneProjectUrl}">
+ <ww:text name="menu.add.m1Project"/>
+ </ww:a>
+ </div>
+ <div class="body">
+ <ww:url id="addAntProjectUrl" action="addProjectInput" namespace="/" includeParams="none">
+ <ww:param name="projectType">ant</ww:param>
+ </ww:url>
+ <ww:a href="%{addAntProjectUrl}">
+ <ww:text name="menu.add.antProject"/>
+ </ww:a>
+ </div>
+ <div class="body">
+ <ww:url id="addShellProjectUrl" action="addProjectInput" namespace="/" includeParams="none">
+ <ww:param name="projectType">shell</ww:param>
+ </ww:url>
+ <ww:a href="%{addShellProjectUrl}">
+ <ww:text name="menu.add.shellProject"/>
+ </ww:a>
+ </div>
</div>
</pss:ifAuthorized>
<pss:ifAnyAuthorized permissions="continuum-manage-schedules,continuum-manage-configuration,continuum-manage-users">
- <div id="projectmenu" class="toolgroup">
- <div class="label"><ww:text name="menu.administration"/></div>
- <div>
- <pss:ifAuthorized permission="continuum-manage-schedules">
- <ww:url id="scheduleUrl" namespace="/" action="schedules"/>
- <div class="body">
- <ww:a href="%{scheduleUrl}"><ww:text name="menu.administration.schedules"/></ww:a>
- </div>
- </pss:ifAuthorized>
- <pss:ifAuthorized permission="continuum-manage-configuration">
- <ww:url id="configurationUrl" action="configuration" namespace="/admin" method="default"/>
- <div class="body">
- <ww:a href="%{configurationUrl}"><ww:text name="menu.administration.configuration"/></ww:a>
- </div>
- </pss:ifAuthorized>
- <pss:ifAuthorized permission="continuum-manage-users">
- <ww:url id="userListUrl" action="userlist" namespace="/security" includeParams="none"/>
- <div class="body">
- <ww:a href="%{userListUrl}">Users</ww:a>
- </div>
- </pss:ifAuthorized>
+ <div id="projectmenu" class="toolgroup">
+ <div class="label">
+ <ww:text name="menu.administration"/>
+ </div>
+ <div>
+ <pss:ifAuthorized permission="continuum-manage-schedules">
+ <ww:url id="scheduleUrl" namespace="/" action="schedules"/>
+ <div class="body">
+ <ww:a href="%{scheduleUrl}">
+ <ww:text name="menu.administration.schedules"/>
+ </ww:a>
+ </div>
+ </pss:ifAuthorized>
+ <pss:ifAuthorized permission="continuum-manage-configuration">
+ <ww:url id="configurationUrl" action="configuration" namespace="/admin" method="default"/>
+ <div class="body">
+ <ww:a href="%{configurationUrl}">
+ <ww:text name="menu.administration.configuration"/>
+ </ww:a>
+ </div>
+ <ww:url id="configurationUrl" action="configureAppearance" namespace="/admin"/>
+ <div class="body">
+ <ww:a href="%{configurationUrl}">
+ <ww:text name="menu.administration.appearance"/>
+ </ww:a>
+ </div>
+ </pss:ifAuthorized>
+ <pss:ifAuthorized permission="continuum-manage-users">
+ <ww:url id="userListUrl" action="userlist" namespace="/security" includeParams="none"/>
+ <div class="body">
+ <ww:a href="%{userListUrl}">Users</ww:a>
+ </div>
+ </pss:ifAuthorized>
</div>
</div>
</pss:ifAnyAuthorized>
<c:if test="${sessionScope.securitySession.authenticated}">
- <div id="projectmenu" class="toolgroup">
- <div class="label"><ww:text name="menu.account.options"/></div>
- <ww:url id="accountUrl" action="account" namespace="/security" includeParams="none"/>
- <div class="body">
- <ww:a href="%{accountUrl}"><ww:text name="user.edit.account"/></ww:a>
+ <div id="projectmenu" class="toolgroup">
+ <div class="label">
+ <ww:text name="menu.account.options"/>
+ </div>
+ <ww:url id="accountUrl" action="account" namespace="/security" includeParams="none"/>
+ <div class="body">
+ <ww:a href="%{accountUrl}">
+ <ww:text name="user.edit.account"/>
+ </ww:a>
+ </div>
</div>
- </div>
</c:if>
<div id="projectmenu" class="toolgroup">
@@ -97,5 +129,5 @@
<div id="litem10" class="body">Build in Error</div>
</div>
</div>
-</div>
+ </div>
</ww:i18n>
Modified: maven/continuum/trunk/design/white-site/src/site/xdoc/admin/appearance.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/design/white-site/src/site/xdoc/admin/appearance.xml?view=diff&rev=481166&r1=481165&r2=481166
==============================================================================
--- maven/continuum/trunk/design/white-site/src/site/xdoc/admin/appearance.xml (original)
+++ maven/continuum/trunk/design/white-site/src/site/xdoc/admin/appearance.xml Thu Nov 30 22:26:12 2006
@@ -1,18 +1,21 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
- ~ Copyright 2005-2006 The Apache Software Foundation.
+ ~ 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
~
- ~ Licensed 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
~
- ~ 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.
+ ~ 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.
-->
<document>
@@ -29,42 +32,43 @@
<h2>Company Details</h2>
</div>
-
- <p>
- Enter the details of the company super POM below. If it exists, the organization name, URL and logo will be read
- from it.
- </p>
<form action="../index.html">
- <table>
- <tr>
- <th>Group ID</th>
- <td>org.apache</td>
- </tr>
- <tr>
- <th>Artifact ID</th>
- <td>apache</td>
- </tr>
- </table>
- <div style="float: right"><p><a href="edit-company-pom.html">Edit Company POM</a></p></div>
- <h3>POM Information</h3>
- <table>
- <tr>
- <th>Name</th>
- <td>Apache Software Foundation</td>
- </tr>
- <tr>
- <th>URL</th>
- <td><a href="http://www.apache.org">
- <code>http://www.apache.org</code>
- </a></td>
- </tr>
- <tr>
- <th>Logo URL</th>
- <td>
- <code>http://www.apache.org/images/asf_logo_wide.gif</code>
- </td>
- </tr>
- </table>
+ <table>
+ <tr>
+ <th>Group ID</th>
+ <td>org.apache</td>
+ </tr>
+ <tr>
+ <th>Artifact ID</th>
+ <td>apache</td>
+ </tr>
+ </table>
+ <div style="float: right">
+ <p>
+ <a href="edit-company-pom.html">Edit Company POM</a>
+ </p>
+ </div>
+ <h3>POM Information</h3>
+ <table>
+ <tr>
+ <th>Name</th>
+ <td>Apache Software Foundation</td>
+ </tr>
+ <tr>
+ <th>URL</th>
+ <td>
+ <a href="http://www.apache.org">
+ <code>http://www.apache.org</code>
+ </a>
+ </td>
+ </tr>
+ <tr>
+ <th>Logo URL</th>
+ <td>
+ <code>http://www.apache.org/images/asf_logo_wide.gif</code>
+ </td>
+ </tr>
+ </table>
</form>
</body>
Modified: maven/continuum/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/pom.xml?view=diff&rev=481166&r1=481165&r2=481166
==============================================================================
--- maven/continuum/trunk/pom.xml (original)
+++ maven/continuum/trunk/pom.xml Thu Nov 30 22:26:12 2006
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
+<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2006 The Apache Software Foundation.
~
@@ -15,10 +14,8 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-
-<project xmlns="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">
+<project xmlns="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">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.maven</groupId>
@@ -68,13 +65,13 @@
<plugin>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-maven-plugin</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.3.2</version>
<extensions>true</extensions>
</plugin>
<plugin>
<groupId>org.codehaus.modello</groupId>
<artifactId>modello-maven-plugin</artifactId>
- <version>1.0-alpha-11-SNAPSHOT</version>
+ <version>1.0-alpha-11</version>
</plugin>
</plugins>
</pluginManagement>
@@ -95,6 +92,7 @@
<module>continuum-xmlrpc</module>
<module>continuum-release</module>
<module>continuum-data-management</module>
+ <module>continuum-configuration</module>
</modules>
<repositories>
<repository>
@@ -105,7 +103,7 @@
<enabled>false</enabled>
</releases>
</repository>
- </repositories>
+ </repositories>
<pluginRepositories>
<pluginRepository>
<id>codehaus.org</id>
@@ -123,7 +121,7 @@
<enabled>false</enabled>
</releases>
</pluginRepository>
- </pluginRepositories>
+ </pluginRepositories>
<dependencies>
<dependency>
<groupId>junit</groupId>
@@ -257,6 +255,11 @@
</dependency>
<dependency>
<groupId>org.apache.maven.continuum</groupId>
+ <artifactId>continuum-configuration</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.continuum</groupId>
<artifactId>continuum-store</artifactId>
<classifier>tests</classifier>
<version>${pom.version}</version>
@@ -499,7 +502,7 @@
<artifactId>plexus-security-keys-jdo</artifactId>
<version>${plexus-security.version}</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.codehaus.plexus.security</groupId>
<artifactId>plexus-security-authentication-provider-keystore</artifactId>
<version>${plexus-security.version}</version>