You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ca...@apache.org on 2006/08/14 22:36:21 UTC
svn commit: r431430 [3/3] - in /maven/continuum/branches/continuum-acegi: ./
continuum-api/src/main/java/org/apache/maven/continuum/
continuum-api/src/main/java/org/apache/maven/continuum/project/builder/
continuum-cc/src/main/java/org/apache/maven/con...
Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/localization/Continuum.properties
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/localization/Continuum.properties?rev=431430&r1=431429&r2=431430&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/localization/Continuum.properties (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/localization/Continuum.properties Mon Aug 14 13:36:17 2006
@@ -1,6 +1,6 @@
-// ----------------------------------------------------------------------
-// COMMONS
-// ----------------------------------------------------------------------
+# ----------------------------------------------------------------------
+# COMMONS
+# ----------------------------------------------------------------------
webwork.date=MMM dd, yyyy hh:mm:ss aaa z
message.success = Success
@@ -14,21 +14,22 @@
delete = Delete
save = Save
add = Add
-workingCopy = Working Copy
+workingCopy = Working Copy
builds = Builds
info = Info
or = OR
-// ----------------------------------------------------------------------
-// Page: Top
-// ----------------------------------------------------------------------
+# ----------------------------------------------------------------------
+# Page: Top
+# ----------------------------------------------------------------------
top.logo.default = [Your company logo here]
-// ----------------------------------------------------------------------
-// Page: Menu
-// ----------------------------------------------------------------------
+# ----------------------------------------------------------------------
+# Page: Menu
+# ----------------------------------------------------------------------
menu.continuum.about = About
menu.continuum.showProjects = Show Projects
+menu.continuum.showProjectGroups = Show Project Groups
menu.addProject = Add Project
menu.add.m2Project = Maven 2.0.x Project
menu.add.m1Project = Maven 1.x Project
@@ -39,17 +40,25 @@
menu.administration.schedules = Schedules
menu.administration.users = Users
-// ----------------------------------------------------------------------
-// Page: About
-// ----------------------------------------------------------------------
+# ----------------------------------------------------------------------
+# Page: error
+# ----------------------------------------------------------------------
+error.page.title = Error Page
+error.section.title = An Internal Error Has Occurred!
+error.exception.message = Exception Message:
+error.message = The server was not able of performing the request. Please try again later. Contact the administrator if this problem persists.
+
+# ----------------------------------------------------------------------
+# Page: About
+# ----------------------------------------------------------------------
about.page.title = Continuum - About
about.section.title = About Continuum
about.version.label = Version
about.version.number = ${project.version}
-// ----------------------------------------------------------------------
-// Page: Login
-// ----------------------------------------------------------------------
+# ----------------------------------------------------------------------
+# Page: Login
+# ----------------------------------------------------------------------
login.page.title = Continuum - Authentication
login.section.title = Authentication
login.username = Username
@@ -58,22 +67,29 @@
login.submit = Connect
login.bad_login_password = Wrong username or password
-// ----------------------------------------------------------------------
-// Page: Summary
-// ----------------------------------------------------------------------
+# ----------------------------------------------------------------------
+# Page: Summary
+# ----------------------------------------------------------------------
summary.page.title = Continuum - Summary
summary.section.title = Continuum Projects
summary.projectTable.name = Name
summary.projectTable.version = Version
summary.projectTable.build = Build
summary.projectTable.group = Group
-summary.buildAll = Build All
-summary.buildHistory = Build History
-summary.buildNow = Build Now
-
-// ----------------------------------------------------------------------
-// Page: Configuration
-// ----------------------------------------------------------------------
+summary.buildAll = Build All
+summary.buildHistory = Build history
+summary.buildNow = Build Now
+
+# ----------------------------------------------------------------------
+# Page: Group Summary
+# ----------------------------------------------------------------------
+groups.page.title = Continuum - Group Summary
+groups.section.title = Project Group:
+groups.manage.label = Manage Group
+
+# ----------------------------------------------------------------------
+# Page: Configuration
+# ----------------------------------------------------------------------
configuration.page.title = Continuum - Configuration
configuration.section.title = General Configuration
configuration.guest.label = Guests
@@ -86,9 +102,20 @@
configuration.companyUrl.label = Company URL
configuration.submit.edit = Edit
-// ----------------------------------------------------------------------
-// Page: AddMavenOneProject
-// ----------------------------------------------------------------------
+# ----------------------------------------------------------------------
+# Page: Add Project
+# ----------------------------------------------------------------------
+add.project.unknown.host.error = The specified host is either unknown or inaccessible.
+add.project.malformed.url.error = The URL provided is malformed.
+add.project.xml.parse.error = The XML content of the POM can not be parsed.
+add.project.extend.error = Cannot use a POM with an 'extend' element
+add.project.missing.groupid.error = Missing 'groupId' element in the POM.
+add.project.missing.artifactid.error = Missing 'artifactId' element in the POM.
+add.project.unknown.error = The specified resource cannot be accessed.
+
+# ----------------------------------------------------------------------
+# Page: AddMavenOneProject
+# ----------------------------------------------------------------------
add.m1.project.page.title = Continuum - Add Maven 1 Project
add.m1.project.section.title = Add Maven 1.x Project
add.m1.project.m1PomUrl.label = M1 POM Url
@@ -98,9 +125,9 @@
add.m1.project.m1PomFile.message = Enter the local filename of the Maven 1 POM to upload
add.m1.project.m1PomFile.error = You must enter a valid URL
-// ----------------------------------------------------------------------
-// Page: AddMavenTwoProject
-// ----------------------------------------------------------------------
+# ----------------------------------------------------------------------
+# Page: AddMavenTwoProject
+# ----------------------------------------------------------------------
add.m2.project.page.title = Continuum - Add Maven 2 Project
add.m2.project.section.title = Add Maven 2.0+ Project
add.m2.project.m2PomUrl.label = POM Url
@@ -110,9 +137,9 @@
add.m2.project.m2PomFile.message = Enter the local filename of the Maven 2 POM to upload (works only for a single project without modules).
add.m2.project.m2PomFile.error = You must enter a valid URL
-// ----------------------------------------------------------------------
-// Page: AddProject (ant or shell)
-// ----------------------------------------------------------------------
+# ----------------------------------------------------------------------
+# Page: AddProject (ant or shell)
+# ----------------------------------------------------------------------
add.shell.project.page.title = Continuum - Add Shell Project
add.shell.project.section.title = Add Shell Project
add.ant.project.page.title = Add Ant Project
@@ -143,16 +170,16 @@
projectVersion.error = You must provide a version
projectVersion.message = Enter the version of the project
-// ----------------------------------------------------------------------
-// Page: DeleteProject
-// ----------------------------------------------------------------------
+# ----------------------------------------------------------------------
+# Page: DeleteProject
+# ----------------------------------------------------------------------
deleteProject.page.title = Continuum - Delete Continuum Project
deleteProject.section.title = Delete Continuum Project
deleteProject.confirmation.message = Are you sure you want to delete the project "{0}"?
-// ----------------------------------------------------------------------
-// Page: ProjectView
-// ----------------------------------------------------------------------
+# ----------------------------------------------------------------------
+# Page: ProjectView
+# ----------------------------------------------------------------------
projectView.page.title = Continuum - Continuum Project
projectView.section.title = Continuum Project
projectView.project.name = Project Name
@@ -178,9 +205,9 @@
projectView.developer.name = Name
projectView.developer.email = Email
-// ----------------------------------------------------------------------
-// Page: ProjectEdit
-// ----------------------------------------------------------------------
+# ----------------------------------------------------------------------
+# Page: ProjectEdit
+# ----------------------------------------------------------------------
projectEdit.page.title = Continuum - Update Continuum Project
projectEdit.section.title = Update Continuum Project
projectEdit.project.name.label = Project Name
@@ -190,9 +217,9 @@
projectEdit.project.scmPassword.label = Scm Password
projectEdit.project.scmTag.label = Scm Branch/Tag
-// ----------------------------------------------------------------------
-// Page: BuildDefinitionEdit
-// ----------------------------------------------------------------------
+# ----------------------------------------------------------------------
+# Page: BuildDefinitionEdit
+# ----------------------------------------------------------------------
buildDefinition.page.title = Continuum - Add/Edit Build Definition
buildDefinition.section.title = Add/Edit Build Definition
buildDefinition.buildFile.ant.label = Ant build filename
@@ -204,23 +231,23 @@
buildDefinition.defaultForProject.label = Is it default?
buildDefinition.schedule.label = Schedule
-// ----------------------------------------------------------------------
-// Page: DeleteBuildDefinition
-// ----------------------------------------------------------------------
+# ----------------------------------------------------------------------
+# Page: DeleteBuildDefinition
+# ----------------------------------------------------------------------
deleteBuildDefinition.page.title = Continuum - Delete Build Definition
deleteBuildDefinition.section.title = Delete Build Definition
deleteBuildDefinition.confirmation.message = Are you sure you want to delete the build definition "{0}"?
-// ----------------------------------------------------------------------
-// Page: DeleteNotifier
-// ----------------------------------------------------------------------
+# ----------------------------------------------------------------------
+# Page: DeleteNotifier
+# ----------------------------------------------------------------------
deleteNotifier.page.title = Continuum - Delete Notifier
deleteNotifier.section.title = Delete Notifier
deleteNotifier.confirmation.message = Are you sure you want to delete the {0} notifier "{1}"?
-// ----------------------------------------------------------------------
-// Page: Notifier
-// ----------------------------------------------------------------------
+# ----------------------------------------------------------------------
+# Page: Notifier
+# ----------------------------------------------------------------------
notifier.page.add.title = Continuum - Add Notifier
notifier.section.add.title = Add Notifier
notifier.page.title = Continuum - Add/Edit {0} Notifier
@@ -249,9 +276,9 @@
notifier.event.sendOnError = Send on Error
notifier.event.sendOnWarning = Send on Warning
-// ----------------------------------------------------------------------
-// Page: BuildResults
-// ----------------------------------------------------------------------
+# ----------------------------------------------------------------------
+# Page: BuildResults
+# ----------------------------------------------------------------------
buildResults.page.title = Continuum - Build results
buildResults.section.title = Build results for {0}
buildResults.buildNumber = Build #
@@ -260,9 +287,9 @@
buildResults.state = State
buildResults.noChanges = No changes
-// ----------------------------------------------------------------------
-// Page: BuildResults
-// ----------------------------------------------------------------------
+# ----------------------------------------------------------------------
+# Page: BuildResults
+# ----------------------------------------------------------------------
buildResult.page.title = Continuum - Build result
buildResult.section.title = Build result for {0}
buildResult.startTime = Start Time
@@ -280,15 +307,15 @@
buildResult.changes.files = Files
buildResult.changesSinceLastSuccess = Other Changes Since Last Success
-// ----------------------------------------------------------------------
-// Page: WorkingCopy
-// ----------------------------------------------------------------------
+# ----------------------------------------------------------------------
+# Page: WorkingCopy
+# ----------------------------------------------------------------------
workingCopy.page.title = Continuum - Working Copy
workingCopy.section.title = Working Copy for {0}
-// ----------------------------------------------------------------------
-// Page: Schedules
-// ----------------------------------------------------------------------
+# ----------------------------------------------------------------------
+# Page: Schedules
+# ----------------------------------------------------------------------
schedules.page.title = Continuum - Schedules
schedules.section.title = Schedules
schedules.table.name = Name
@@ -296,9 +323,9 @@
schedules.table.delay = Quiet Period
schedules.table.cronExpression = Cron Expression
-// ----------------------------------------------------------------------
-// Page: Add/EditSchedule
-// ----------------------------------------------------------------------
+# ----------------------------------------------------------------------
+# Page: Add/EditSchedule
+# ----------------------------------------------------------------------
addSchedule.page.title=Continuum - Add Schedule
addSchedule.section.title = Add Schedule
Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/log4j.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/log4j.xml?rev=431430&r1=431429&r2=431430&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/log4j.xml (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/log4j.xml Mon Aug 14 13:36:17 2006
@@ -14,7 +14,7 @@
</appender>
<root>
- <priority value="INFO"/>
+ <priority value="INFO"/>
<appender-ref ref="default"/>
</root>
Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/xwork.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/xwork.xml?rev=431430&r1=431429&r2=431430&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/xwork.xml (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/xwork.xml Mon Aug 14 13:36:17 2006
@@ -1,11 +1,13 @@
-<!DOCTYPE xwork PUBLIC "-//OpenSymphony Group//XWork 1.0//EN" "http://www.opensymphony.com/xwork/xwork-1.0.dtd">
+<!DOCTYPE xwork PUBLIC "-//OpenSymphony Group//XWork 1.1.1//EN" "http://www.opensymphony.com/xwork/xwork-1.1.1.dtd">
<xwork>
<include file="webwork-default.xml"/>
<package name="default" extends="webwork-default">
<interceptors>
+ <interceptor name="exception-logging" class="exceptionLogging"/>
<interceptor-stack name="defaultContinuumStack">
+ <interceptor-ref name="exception-logging"/>
<interceptor-ref name="prepare"/>
<interceptor-ref name="servlet-config"/>
<interceptor-ref name="chain"/>
@@ -23,9 +25,15 @@
<default-interceptor-ref name="defaultContinuumStack"/>
<global-results>
- <result name="error">error.jsp</result>
+ <result name="internalError" type="redirect">/error.jsp</result>
+ <result name="continuumInitialization" type="redirect">/configuration!input.action</result>
</global-results>
+ <global-exception-mappings>
+ <exception-mapping exception="org.apache.maven.continuum.initialization.ContinuumInitializationException" result="continuumInitialization"/>
+ <exception-mapping exception="java.lang.Exception" result="internalError"/>
+ </global-exception-mappings>
+
<action name="checkConfiguration" class="checkConfiguration">
<result name="input">/redirectToContinuumInitialization.jsp</result>
</action>
@@ -46,6 +54,10 @@
<action name="summary" class="summary">
<result name="success">summary.jsp</result>
+ </action>
+
+ <action name="groupSummary" class="groupSummary">
+ <result name="success">groupSummary.jsp</result>
</action>
<action name="addMavenTwoProject" class="addMavenTwoProject">
Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/WEB-INF/web.xml?rev=431430&r1=431429&r2=431430&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/WEB-INF/web.xml (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/WEB-INF/web.xml Mon Aug 14 13:36:17 2006
@@ -6,7 +6,7 @@
<web-app>
- <display-name>Continuum</display-name>
+ <display-name>Continuum Webapp</display-name>
<context-param>
<param-name>extremecomponentsPreferencesLocation</param-name>
Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/css/tigris.css
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/css/tigris.css?rev=431430&r1=431429&r2=431430&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/css/tigris.css (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/css/tigris.css Mon Aug 14 13:36:17 2006
@@ -100,8 +100,9 @@
.app h3 a:link, .app h3 a:visited, .app h4 a:link, .app h4 a:visited {
- color: #fff !important;
- /*text-decoration: underline;*/
+ color:black !important;
+ /* TODO was #fff causing white on white issues for me, so set it black */
+ /*text-decoration: underline;*/
}
.app h4 {
@@ -874,4 +875,4 @@
.tablehead {color: #FFFFFF;
}
-#footer {background: url(../images/footerborder.gif) 0 5px; padding: 10px 0px 8px 0px;}
\ No newline at end of file
+#footer {background: url(../images/footerborder.gif) 0 5px; padding: 10px 0px 8px 0px;}
Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/error.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/error.jsp?rev=431430&r1=431429&r2=431430&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/error.jsp (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/error.jsp Mon Aug 14 13:36:17 2006
@@ -2,13 +2,13 @@
<html>
<ww:i18n name="localization.Continuum">
<head>
- <title>ERROR</title>
+ <title><ww:text name="error.page.title"/></title>
</head>
<body>
<div id="axial" class="h3">
- <h3>ERROR</h3>
+ <h3><ww:text name="error.section.title"/></h3>
<p>
- TODO
+ <ww:text name="error.message"/>
</p>
</div>
</body>
Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/navigations/Menu.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/navigations/Menu.jsp?rev=431430&r1=431429&r2=431430&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/navigations/Menu.jsp (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/navigations/Menu.jsp Mon Aug 14 13:36:17 2006
@@ -12,6 +12,9 @@
<div class="body">
<a href="<ww:url value="/summary.action"/>"><ww:text name="menu.continuum.showProjects"/></a>
</div>
+ <div class="body">
+ <a href="<ww:url value="/groupSummary.action"/>"><ww:text name="menu.continuum.showProjectGroups"/></a>
+ </div>
</div>
</div>
Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/summary.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/summary.jsp?rev=431430&r1=431429&r2=431430&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/summary.jsp (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/summary.jsp Mon Aug 14 13:36:17 2006
@@ -9,7 +9,7 @@
<body>
<div id="h3">
<h3><ww:text name="summary.section.title"/></h3>
- <ww:set name="projects" value="projects" scope="request"/>
+ <%--<ww:set name="projects" value="projects" scope="request"/>--%>
<ec:table items="projects"
var="project"
showExports="false"
Modified: maven/continuum/branches/continuum-acegi/continuum-xmlrpc/src/main/java/org/apache/maven/continuum/xmlrpc/DefaultContinuumXmlRpc.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-xmlrpc/src/main/java/org/apache/maven/continuum/xmlrpc/DefaultContinuumXmlRpc.java?rev=431430&r1=431429&r2=431430&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-xmlrpc/src/main/java/org/apache/maven/continuum/xmlrpc/DefaultContinuumXmlRpc.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-xmlrpc/src/main/java/org/apache/maven/continuum/xmlrpc/DefaultContinuumXmlRpc.java Mon Aug 14 13:36:17 2006
@@ -469,22 +469,6 @@
return xmlRpcHelper.objectToHashtable( object, excludedProperties );
}
- private Hashtable convertScmFile( Object object )
- throws IllegalAccessException, InvocationTargetException
- {
- Set excludedProperties = new HashSet();
-
- return xmlRpcHelper.objectToHashtable( object, excludedProperties );
- }
-
- private Hashtable convertScmResult( Object object )
- throws IllegalAccessException, InvocationTargetException
- {
- Set excludedProperties = new HashSet();
-
- return xmlRpcHelper.objectToHashtable( object, excludedProperties );
- }
-
// ----------------------------------------------------------------------
//
// ----------------------------------------------------------------------
Modified: maven/continuum/branches/continuum-acegi/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/pom.xml?rev=431430&r1=431429&r2=431430&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/pom.xml (original)
+++ maven/continuum/branches/continuum-acegi/pom.xml Mon Aug 14 13:36:17 2006
@@ -109,6 +109,12 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>jmock</groupId>
+ <artifactId>jmock</artifactId>
+ <version>1.0.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
<version>1.0-alpha-10-SNAPSHOT</version>