Modified: maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/View.vm URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/View.vm?rev=406895&r1=406894&r2=406895&view=diff ============================================================================== --- maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/View.vm (original) +++ maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/View.vm Tue May 16 03:26:59 2006 @@ -1,4 +1,4 @@ -$page.setTitle( "Continuum - Project View: ${item.name}" ) +$page.setTitle( "Continuum - Project View: Continuum Web" ) #if ( $data.user ) #set ( $c1user = $continuum.getUser( $data.user.userId ) ) @@ -10,12 +10,14 @@ #if ( $continuum.security.isAuthorized( $c1user, "showProject" ) )
-

- Info +

+ Info #set ( $buildsLink = $link.setPage('ProjectBuilds.vm').addPathInfo('view', "ProjectBuilds").addPathInfo('id', $item.id) ) - Builds - #set ( $workingCopy = $link.setPage('WorkingCopy.vm').addPathInfo('view', "WorkingCopy").addPathInfo('id', $item.id) ) - Working Copy + Builds + #if ( $item.state == 10 || $item.state == 2 || $item.state == 3 || $item.state == 4 || $item.state == 6 ) + #set ( $workingCopy = $link.setPage('WorkingCopy.vm').addPathInfo('view', "WorkingCopy").addPathInfo('id', $item.id) ) + Working Copy + #end

#end @@ -24,7 +26,8 @@

$i18n.getString( $form.view.titleKey )

- +
+ @@ -41,33 +44,41 @@ +
$i18n.getString( "project.name.label" ) $item.name$i18n.getString( "project.group.label" ) $item.projectGroup.name
#if ( $continuum.security.isAuthorized( $c1user, "editProject" ) )
+ + +
+
+ +
+
#end
-

$i18n.getString( "project.buildDefinitions.label" )

- +
+ - - - - - - - + + + + + + + #foreach ( $buildDefinition in $project.buildDefinitions ) @@ -89,22 +100,38 @@ #end - + + #end +
GoalsArgumentsPOM FileProfileScheduleFrom GoalsArgumentsPOM FileProfileScheduleFrom 
Project + + #if ( $continuum.security.isAuthorized( $c1user, "buildProject" ) ) + #set ( $buildNowLink = $link.addPathInfo('action', 'cam').addPathInfo('cid','buildProjectWithBuildDefinition').addPathInfo('id', $item.id).addPathInfo('buildDefinitionId', $buildDefinition.id) ) + Build Now + #else + Build Now + #end + #if ( $continuum.security.isAuthorized( $c1user, "editBuildDefinition" ) ) - #set ( $buildDefinitionLink = $link.setPage('BuildDefinition.vm').addPathInfo('view','BuildDefinition').addPathInfo('buildDefinitionId', $buildDefinition.id).addPathInfo('id', $item.id) ) - Edit | + #set ( $buildDefinitionLink = $link.setPage('BuildDefinition.vm').addPathInfo('view','BuildDefinition').addPathInfo('buildDefinitionId', $buildDefinition.id).addPathInfo('id', $item.id) ) + Edit + #else + Edit #end + #if ( $continuum.security.isAuthorized( $c1user, "deleteBuildDefinition" ) ) - #set ( $deleteBuildDefinitionLink = $link.setPage('DeleteBuildDefinition.vm').addPathInfo('buildDefinitionId', $buildDefinition.id).addPathInfo('id', $item.id).addPathInfo('executorId', $item.executorId) ) - Delete + #set ( $deleteBuildDefinitionLink = $link.setPage('DeleteBuildDefinition.vm').addPathInfo('buildDefinitionId', $buildDefinition.id).addPathInfo('id', $item.id).addPathInfo('executorId', $item.executorId) ) + Delete + #else + Delete #end
#if ( $continuum.security.isAuthorized( $c1user, "addBuildDefinition" ) )
+ +
@@ -112,19 +139,21 @@
#end #if ( $project.notifiers )

$i18n.getString( "project.notifiers.label" )

- +
+ - - - - - + + + + + #foreach ( $notifier in $project.notifiers ) @@ -168,35 +197,45 @@ User #end - + + + #else + + #end #end +
TypeRecipientEventsFrom TypeRecipientEventsFrom 
- #if ( $notifier.isFromUser() ) + #if ( $notifier.isFromUser() ) + #if ( $continuum.security.isAuthorized( $c1user, "editNotifier" ) ) #if ( $notifier.type == "irc" ) #set ( $editNotifierLink = $link.setPage('EditIrcNotifier.vm').addPathInfo('view','EditIrcNotifier').addPathInfo('notifierId', $notifier.id).addPathInfo('id', $item.id).addPathInfo('executorId', $item.executorId) ) - Edit + Edit #elseif ( $notifier.type == "mail" ) #set ( $editNotifierLink = $link.setPage('EditMailNotifier.vm').addPathInfo('view','EditMailNotifier').addPathInfo('notifierId', $notifier.id).addPathInfo('id', $item.id).addPathInfo('executorId', $item.executorId) ) - Edit + Edit #elseif ( $notifier.type == "msn" ) #set ( $editNotifierLink = $link.setPage('EditMsnNotifier.vm').addPathInfo('view','EditMsnNotifier').addPathInfo('notifierId', $notifier.id).addPathInfo('id', $item.id).addPathInfo('executorId', $item.executorId) ) - Edit + Edit #elseif ( $notifier.type == "jabber" ) #set ( $editNotifierLink = $link.setPage('EditJabberNotifier.vm').addPathInfo('view','EditJabberNotifier').addPathInfo('notifierId', $notifier.id).addPathInfo('id', $item.id).addPathInfo('executorId', $item.executorId) ) - Edit + Edit #end + #else + Edit #end + #if ( $continuum.security.isAuthorized( $c1user, "deleteNotifier" ) ) #set ( $deleteNotifierLink = $link.setPage('DeleteNotifier.vm').addPathInfo('notifierId', $notifier.id).addPathInfo('id', $item.id).addPathInfo('executorId', $item.executorId) ) - | Delete + Delete + #else + Delete #end - #end -  
#if ( $continuum.security.isAuthorized( $c1user, "addNotifier" ) )
+ +
@@ -204,6 +243,7 @@
#end @@ -211,7 +251,8 @@ #if ( $project.dependencies )

$i18n.getString( "project.dependencies.label" )

- +
+ @@ -220,24 +261,28 @@ #end +
Name
$!{dependency.groupId}:$!{dependency.artifactId}:$!{dependency.version}
#end #if ( $project.developers )

$i18n.getString( "project.developers.label" )

- +
+ @@ -250,10 +295,12 @@ #end +
Name Email
Modified: maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/ViewIrcNotifier.vm URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/ViewIrcNotifier.vm?rev=406895&r1=406894&r2=406895&view=diff ============================================================================== --- maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/ViewIrcNotifier.vm (original) +++ maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/ViewIrcNotifier.vm Tue May 16 03:26:59 2006 @@ -4,7 +4,8 @@

IRC Notifier

- +
+ @@ -17,6 +18,7 @@ +
IRC Host $notifier.configuration.hostIRC Channel $notifier.configuration.channel
Modified: maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/ViewJabberNotifier.vm URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/ViewJabberNotifier.vm?rev=406895&r1=406894&r2=406895&view=diff ============================================================================== --- maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/ViewJabberNotifier.vm (original) +++ maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/ViewJabberNotifier.vm Tue May 16 03:26:59 2006 @@ -4,7 +4,8 @@

Jabber Notifier

- +
+ @@ -21,6 +22,7 @@ +
Jabber Host $notifier.configuration.hostIs Jabber Group? $notifier.configuration.isGroup
Modified: maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/ViewMailNotifier.vm URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/ViewMailNotifier.vm?rev=406895&r1=406894&r2=406895&view=diff ============================================================================== --- maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/ViewMailNotifier.vm (original) +++ maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/ViewMailNotifier.vm Tue May 16 03:26:59 2006 @@ -4,11 +4,13 @@

Mail Notifier

- +
+ +
Address $notifier.configuration.address
Modified: maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/ViewMsnNotifier.vm URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/ViewMsnNotifier.vm?rev=406895&r1=406894&r2=406895&view=diff ============================================================================== --- maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/ViewMsnNotifier.vm (original) +++ maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/ViewMsnNotifier.vm Tue May 16 03:26:59 2006 @@ -4,7 +4,8 @@

MSN Notifier

- +
+ @@ -17,6 +18,7 @@ +
MSN Login $notifier.configuration.loginMSN Recipient $notifier.configuration.address
Modified: maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/WorkingCopy.vm URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/WorkingCopy.vm?rev=406895&r1=406894&r2=406895&view=diff ============================================================================== --- maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/WorkingCopy.vm (original) +++ maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/WorkingCopy.vm Tue May 16 03:26:59 2006 @@ -10,12 +10,12 @@ #if ( $continuum.security.isAuthorized( $c1user, "showProject" ) )
-

+

#set ( $infoLink = $link.setPage('View.vm').addPathInfo('fid', "$!{project.executorId}Project").addPathInfo('id', $project.id) ) - Info + Info #set ( $buildsLink = $link.setPage('ProjectBuilds.vm').addPathInfo('view', "ProjectBuilds").addPathInfo('id', $project.id) ) - Builds - Working Copy + Builds + Working Copy

#end @@ -25,12 +25,4 @@ #set ( $files = $continuum.getFiles( $project.id, $data.getParameters().getString( "userDirectory" ) ) ) #set ( $baseUrl = $link.setPage('WorkingCopy.vm').addPathInfo('view', "WorkingCopy").addPathInfo('id', $project.id) ) $workingCopy.generate( $files, $baseUrl.toString(), $continuum.getWorkingDirectory( $project.id ) ) - - #if ( $data.getParameters().getString( "file" ) ) - #set( $filename = $data.getParameters().getString( "file" ) ) -
-
- -
- #end
Modified: maven/continuum/trunk/continuum-xmlrpc/pom.xml URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-xmlrpc/pom.xml?rev=406895&r1=406894&r2=406895&view=diff ============================================================================== --- maven/continuum/trunk/continuum-xmlrpc/pom.xml (original) +++ maven/continuum/trunk/continuum-xmlrpc/pom.xml Tue May 16 03:26:59 2006 @@ -42,9 +42,13 @@ continuum-api + org.codehaus.plexus + plexus-utils + + hsqldb hsqldb test - \ No newline at end of file + Modified: maven/continuum/trunk/pom.xml URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/pom.xml?rev=406895&r1=406894&r2=406895&view=diff ============================================================================== --- maven/continuum/trunk/pom.xml (original) +++ maven/continuum/trunk/pom.xml Tue May 16 03:26:59 2006 @@ -11,7 +11,7 @@ pom Continuum Parent Project 1.1-SNAPSHOT - http://maven.apache.org/continuum/ + http://maven.apache.org/continuum jira http://jira.codehaus.org/browse/CONTINUUM @@ -32,7 +32,7 @@ - scm:svn:http://svn.apache.org/repos/asf/maven/continuum/trunk/ + scm:svn:https://svn.apache.org/repos/asf/maven/continuum/trunk/ scm:svn:https://svn.apache.org/repos/asf/maven/continuum/trunk/ http://svn.apache.org/viewcvs.cgi/maven/continuum/trunk/ @@ -42,7 +42,7 @@ org.codehaus.plexus plexus-maven-plugin - 1.1.3 + 1.2 true @@ -55,11 +55,33 @@ continuum-core continuum-model continuum-notifiers + continuum-plexus-application + continuum-rpc-client continuum-store continuum-test continuum-webapp continuum-xmlrpc + + + + false + + snapshots + Maven Central Development Repository + http://snapshots.maven.codehaus.org/maven2 + + + + + + false + + snapshots + Maven Central Development Repository + http://snapshots.maven.codehaus.org/maven2 + + junit @@ -70,7 +92,7 @@ org.codehaus.plexus plexus-container-default - 1.0-alpha-8 + 1.0-alpha-9 @@ -78,72 +100,72 @@ org.apache.maven maven-core - 2.0 + 2.0.4 org.apache.maven maven-model - 2.0 + 2.0.4 org.apache.maven maven-artifact - 2.0-1 + 2.0.4 org.apache.maven maven-project - 2.0-1 + 2.0.4 org.apache.maven maven-settings - 2.0 + 2.0.4 org.apache.maven.scm maven-scm-api - 1.0-beta-3-SNAPSHOT + 1.0-beta-3 org.apache.maven.scm maven-scm-manager-plexus - 1.0-beta-3-SNAPSHOT + 1.0-beta-3 org.apache.maven.scm maven-scm-provider-bazaar - 1.0-beta-3-SNAPSHOT + 1.0-beta-3 org.apache.maven.scm maven-scm-provider-clearcase - 1.0-beta-3-SNAPSHOT + 1.0-beta-3 org.apache.maven.scm maven-scm-provider-cvsexe - 1.0-beta-3-SNAPSHOT + 1.0-beta-3 org.apache.maven.scm maven-scm-provider-local - 1.0-beta-3-SNAPSHOT + 1.0-beta-3 org.apache.maven.scm maven-scm-provider-perforce - 1.0-beta-3-SNAPSHOT + 1.0-beta-3 org.apache.maven.scm maven-scm-provider-starteam - 1.0-beta-3-SNAPSHOT + 1.0-beta-3 org.apache.maven.scm maven-scm-provider-svnexe - 1.0-beta-3-SNAPSHOT + 1.0-beta-3 org.apache.maven.wagon @@ -153,7 +175,7 @@ org.apache.maven.wagon wagon-file - 1.0-alpha-6 + 1.0-alpha-7 org.apache.maven.wagon @@ -163,7 +185,7 @@ org.apache.maven.wagon wagon-ssh - 1.0-alpha-6 + 1.0-alpha-7 org.apache.maven.wagon @@ -231,9 +253,9 @@ 1.1-SNAPSHOT - jpox + org.apache.maven.continuum.jpox jpox - 1.1.0-beta-4 + 1.1.0-20060413 ant @@ -247,27 +269,56 @@ ojdbc ojdbc + + xercesImpl + xerces + + + xmlParserAPIs + xerces + - jpox + org.apache.maven.continuum.jpox jpox-enhancer - 1.1.0-beta-4 + 1.1.0-20060413 + + + jpox + jpox-dbcp + 1.1.0-rc-1 + + + jpox + jpox + + org.codehaus.plexus plexus-utils - 1.2-SNAPSHOT + 1.2 org.codehaus.plexus plexus-jdo2 - 1.0-alpha-3 + 1.0-alpha-4 + + + xercesImpl + xerces + + + xmlParserAPIs + xerces + + org.codehaus.plexus plexus-formica - 1.0-beta-9 + 1.0-beta-10 org.codehaus.plexus @@ -312,11 +363,6 @@ org.codehaus.plexus - plexus-security-api - 1.0-alpha-3-SNAPSHOT - - - org.codehaus.plexus plexus-security-osuser 1.0-alpha-3-SNAPSHOT @@ -331,20 +377,20 @@ 1.7.3.3 - quartz - quartz - 1.4.5 + org.codehaus.plexus + plexus-quartz + 1.0-alpha-2 + + + org.codehaus.plexus + plexus-security-api + 1.0-alpha-3 + + + org.codehaus.plexus + plexus-security-summit + 1.0-alpha-3 - - - - false - - snapshots - Maven Central Development Repository - http://snapshots.maven.codehaus.org/maven2 - -