continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From car...@apache.org
Subject svn commit: r437067 [2/2] - in /maven/continuum/branches/continuum-acegi: continuum-api/src/main/java/org/apache/maven/continuum/build/settings/ continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/ continuum-core/src/main/java/org/a...
Date Sat, 26 Aug 2006 03:47:43 GMT
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=437067&r1=437066&r2=437067&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
Fri Aug 25 20:47:41 2006
@@ -123,10 +123,6 @@
     <listener-class>org.codehaus.plexus.xwork.PlexusLifecycleListener</listener-class>
   </listener>
 
-  <welcome-file-list>
-    <welcome-file>Index.action</welcome-file>
-  </welcome-file-list>
-
   <taglib>
     <taglib-uri>continuum</taglib-uri>
     <taglib-location>/WEB-INF/continuum.tld</taglib-location>

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/configurationEdit.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/configurationEdit.jsp?rev=437067&r1=437066&r2=437067&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/configurationEdit.jsp
(original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/configurationEdit.jsp
Fri Aug 25 20:47:41 2006
@@ -1,33 +1,49 @@
 <%@ 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>
 
-        <div class="axial">
-          <ww:form action="configuration.action" method="post">
-            <table>
-              <tbody>
-                <ww:checkbox label="%{getText('configuration.guest.label')}" name="guestAccountEnabled"
value="guestAccountEnabled" fieldValue="true"/>
-                <ww:textfield label="%{getText('configuration.workingDirectory.label')}"
name="workingDirectory" required="true"/>
-                <ww:textfield label="%{getText('configuration.buildOutputDirectory.label')}"
name="buildOutputDirectory" required="true"/>
-                <ww:textfield label="%{getText('configuration.baseUrl.label')}" name="baseUrl"
required="true"/>
-                <ww:textfield label="%{getText('configuration.companyName.label')}" name="companyName"/>
-                <ww:textfield label="%{getText('configuration.companyLogo.label')}" name="companyLogo"/>
-                <ww:textfield label="%{getText('configuration.companyUrl.label')}" name="companyUrl"/>
-              </tbody>
-            </table>
-            <div class="functnbar3">
-              <c1:submitcancel value="%{getText('save')}" cancel="%{getText('cancel')}"/>
-            </div>
-          </ww:form>
+  <body>
+  <div id="axial" class="h3">
+    <h3><ww:text name="configuration.section.title"/></h3>
+    <ww:form action="configuration.action" method="post">
+
+      <div class="axial">
+        <table border="1" cellspacing="2" cellpadding="3" width="100%">
+          <ww:textfield label="Username" name="username"/>
+          <ww:textfield label="Full Name" name="fullName"/>
+          <ww:textfield label="Email" name="email"/>
+          <ww:textfield label="Password" name="password"/>
+          <ww:textfield label="Password(again)" name="passwordTwo"/>
+        </table>
+      </div>
+
+      <div class="axial">
+
+        <table>
+          <tbody>
+            <ww:checkbox label="%{getText('configuration.guest.label')}" name="guestAccountEnabled"
+                         value="guestAccountEnabled" fieldValue="true"/>
+            <ww:textfield label="%{getText('configuration.workingDirectory.label')}" name="workingDirectory"
+                          required="true"/>
+            <ww:textfield label="%{getText('configuration.buildOutputDirectory.label')}"
name="buildOutputDirectory"
+                          required="true"/>
+            <ww:textfield label="%{getText('configuration.baseUrl.label')}" name="baseUrl"
required="true"/>
+            <ww:textfield label="%{getText('configuration.companyName.label')}" name="companyName"/>
+            <ww:textfield label="%{getText('configuration.companyLogo.label')}" name="companyLogo"/>
+            <ww:textfield label="%{getText('configuration.companyUrl.label')}" name="companyUrl"/>
+          </tbody>
+        </table>
+        <div class="functnbar3">
+          <c1:submitcancel value="%{getText('save')}" cancel="%{getText('cancel')}"/>
         </div>
+
       </div>
-    </body>
-  </ww:i18n>
+    </ww:form>
+  </div>
+  </body>
+</ww:i18n>
 </html>

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/projectView.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/projectView.jsp?rev=437067&r1=437066&r2=437067&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/projectView.jsp
(original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/projectView.jsp
Fri Aug 25 20:47:41 2006
@@ -26,6 +26,9 @@
             <c1:data label="%{getText('projectView.project.scmUrl')}" name="project.scmUrl"/>
             <c1:data label="%{getText('projectView.project.group')}" name="project.projectGroup.name"/>
           </table>
+          <!--
+            wrap this in security tag
+          -->
           <div class="functnbar3">
             <table>
               <tbody>

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=437067&r1=437066&r2=437067&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
Fri Aug 25 20:47:41 2006
@@ -1,69 +1,80 @@
 <%@ taglib uri="/webwork" prefix="ww" %>
 <%@ taglib uri="/tld/extremecomponents" prefix="ec" %>
-<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
+<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c' %>
 <html>
-  <ww:i18n name="localization.Continuum">
-    <head>
-        <title><ww:text name="summary.page.title"/></title>
-    </head>
-    <body>
-      <div id="h3">
-        <h3><ww:text name="summary.section.title"/></h3>
-        <%--<ww:set name="projects" value="projects" scope="request"/>--%>
-        <ec:table items="projects"
-                  var="project"
-                  showExports="false"
-                  showPagination="false"
-                  showStatusBar="false"
-                  filterable="false">
-          <ec:row highlightRow="true">
-            <ec:column property="state" title="&nbsp;" width="1%" cell="org.apache.maven.continuum.web.view.StateCell"/>
-            <ec:column property="name" title="summary.projectTable.name" width="48%">
-                <a href="<ww:url action="projectView">
+<ww:i18n name="localization.Continuum">
+  <head>
+    <title><ww:text name="summary.page.title"/></title>
+  </head>
+
+  <body>
+  <div id="h3">
+    <h3><ww:text name="summary.section.title"/></h3>
+      <%--<ww:set name="projects" value="projects" scope="request"/>--%>
+    <ec:table items="projects"
+              var="project"
+              showExports="false"
+              showPagination="false"
+              showStatusBar="false"
+              filterable="false">
+      <ec:row highlightRow="true">
+        <ec:column property="state" title="&nbsp;" width="1%" cell="org.apache.maven.continuum.web.view.StateCell"/>
+        <ec:column property="name" title="summary.projectTable.name" width="48%">
+          <a href="<ww:url action="projectView">
                   <ww:param name="projectId" value="${project.id}"/>
                 </ww:url>">${project.name}</a>
-            </ec:column>
-            <ec:column property="version" title="summary.projectTable.version" width="13%"/>
-            <ec:column property="buildNumber" title="summary.projectTable.build" width="5%"
cell="org.apache.maven.continuum.web.view.BuildCell"/>
-            <ec:column property="buildNowAction" title="&nbsp;" width="1%" cell="org.apache.maven.continuum.web.view.BuildNowCell"
sortable="false"/>
-            <ec:column property="buildHistoryAction" title="&nbsp;" width="1%" sortable="false">
-              <c:choose>
-                <c:when test="${pageScope.project.latestBuildId > 0}">
-                  <a href='<ww:url action="buildResults">
+        </ec:column>
+        <ec:column property="version" title="summary.projectTable.version" width="13%"/>
+        <ec:column property="buildNumber" title="summary.projectTable.build" width="5%"
+                   cell="org.apache.maven.continuum.web.view.BuildCell"/>
+        <ec:column property="buildNowAction" title="&nbsp;" width="1%"
+                   cell="org.apache.maven.continuum.web.view.BuildNowCell" sortable="false"/>
+        <ec:column property="buildHistoryAction" title="&nbsp;" width="1%" sortable="false">
+          <c:choose>
+            <c:when test="${pageScope.project.latestBuildId > 0}">
+              <a href='<ww:url action="buildResults">
                       <ww:param name="projectId" value="${project.id}"/>
-                    </ww:url>'><img src="<ww:url value='/images/buildhistory.gif'/>"
alt="Build History" title="Build History" border="0"></a>
-                </c:when>
-                <c:otherwise>
-                  <img src="<ww:url value='/images/buildhistory_disabled.gif'/>"
alt="Build History" title="Build History" border="0">
-                </c:otherwise>
-              </c:choose>
-            </ec:column>
-            <ec:column property="workingCopyAction" title="&nbsp;" width="1%" sortable="false">
-              <c:choose>
-                <c:when test="${pageScope.project.state == 10 || pageScope.project.state
== 2 || pageScope.project.state == 3 || pageScope.project.state == 4 || pageScope.project.state
== 6}">
-                  <a href='<ww:url action="workingCopy">
+                    </ww:url>'><img src="<ww:url value='/images/buildhistory.gif'/>"
alt="Build History"
+                                    title="Build History" border="0"></a>
+            </c:when>
+            <c:otherwise>
+              <img src="<ww:url value='/images/buildhistory_disabled.gif'/>" alt="Build
History" title="Build History"
+                   border="0">
+            </c:otherwise>
+          </c:choose>
+        </ec:column>
+        <ec:column property="workingCopyAction" title="&nbsp;" width="1%" sortable="false">
+          <c:choose>
+            <c:when
+                test="${pageScope.project.state == 10 || pageScope.project.state == 2 ||
pageScope.project.state == 3 || pageScope.project.state == 4 || pageScope.project.state ==
6}">
+              <a href='<ww:url action="workingCopy">
                       <ww:param name="projectId" value="${project.id}"/>
-                    </ww:url>'><img src="<ww:url value='/images/workingcopy.gif'/>"
alt="Working Copy" title="Working Copy" border="0"></a>
-                </c:when>
-                <c:otherwise>
-                  <img src="<ww:url value='/images/workingcopy_disabled.gif'/>"
alt="Working Copy" title="Working Copy" border="0">
-                </c:otherwise>
-              </c:choose>
-            </ec:column>
-          </ec:row>
-        </ec:table>
-        <div class="functnbar3">
-          <ww:form action="buildProject.action" method="post">
-            <ww:submit value="%{getText('summary.buildAll')}">
-              <ww:param name="before">
-                <img src="<ww:url value='/images/icon_success_sml.gif'/>" alt="<ww:text
name='message.success'/>" title="<ww:text name='message.success'/>"/> <ww:property
value="nbSuccesses"/>
-                <img src="<ww:url value='/images/icon_warning_sml.gif'/>" alt="<ww:text
name='message.failed'/>" title="<ww:text name='message.failed'/>"/> <ww:property
value="nbFailures"/>
-                <img src="<ww:url value='/images/icon_error_sml.gif'/>" alt="<ww:text
name='message.error'/>" title="<ww:text name='message.error'/>"/> <ww:property
value="nbErrors"/>
-              </ww:param>
-            </ww:submit>
-          </ww:form>
-        </div>
-      </div>
-    </body>
-  </ww:i18n>
+                    </ww:url>'><img src="<ww:url value='/images/workingcopy.gif'/>"
alt="Working Copy"
+                                    title="Working Copy" border="0"></a>
+            </c:when>
+            <c:otherwise>
+              <img src="<ww:url value='/images/workingcopy_disabled.gif'/>" alt="Working
Copy" title="Working Copy"
+                   border="0">
+            </c:otherwise>
+          </c:choose>
+        </ec:column>
+      </ec:row>
+    </ec:table>
+    <div class="functnbar3">
+      <ww:form action="buildProject.action" method="post">
+        <ww:submit value="%{getText('summary.buildAll')}">
+          <ww:param name="before">
+            <img src="<ww:url value='/images/icon_success_sml.gif'/>" alt="<ww:text
name='message.success'/>"
+                 title="<ww:text name='message.success'/>"/> <ww:property value="nbSuccesses"/>
+            <img src="<ww:url value='/images/icon_warning_sml.gif'/>" alt="<ww:text
name='message.failed'/>"
+                 title="<ww:text name='message.failed'/>"/> <ww:property value="nbFailures"/>
+            <img src="<ww:url value='/images/icon_error_sml.gif'/>" alt="<ww:text
name='message.error'/>"
+                 title="<ww:text name='message.error'/>"/> <ww:property value="nbErrors"/>
+          </ww:param>
+        </ww:submit>
+      </ww:form>
+    </div>
+  </div>
+  </body>
+</ww:i18n>
 </html>



Mime
View raw message