Author: brett
Date: Wed Jul 19 22:32:53 2006
New Revision: 423778
URL: http://svn.apache.org/viewvc?rev=423778&view=rev
Log:
admin front page
Added:
maven/repository-manager/trunk/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/index.jsp
(with props)
maven/repository-manager/trunk/maven-repository-webapp/src/main/webapp/images/
Modified:
maven/repository-manager/trunk/design/white-site/src/site/xdoc/admin/config.xml
maven/repository-manager/trunk/design/white-site/src/site/xdoc/admin/index.xml
maven/repository-manager/trunk/maven-repository-webapp/src/main/resources/xwork.xml
maven/repository-manager/trunk/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/configure.jsp
maven/repository-manager/trunk/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
Modified:
maven/repository-manager/trunk/design/white-site/src/site/xdoc/admin/config.xml
URL:
http://svn.apache.org/viewvc/maven/repository-manager/trunk/design/white-site/src/site/xdoc/admin/config.xml?rev=423778&r1=423777&r2=423778&view=diff
==============================================================================
---
maven/repository-manager/trunk/design/white-site/src/site/xdoc/admin/config.xml
(original)
+++
maven/repository-manager/trunk/design/white-site/src/site/xdoc/admin/config.xml
Wed Jul 19 22:32:53 2006
@@ -7,7 +7,7 @@
<div id="contentArea">
<div id="searchBox">
- <form method="post" action="saveConfiguration" namespace="/admin"
validate="true">
+ <form method="post" action="index.html">
<p>
Repository Directory:
<input type="text" size="100"/>
Modified:
maven/repository-manager/trunk/design/white-site/src/site/xdoc/admin/index.xml
URL:
http://svn.apache.org/viewvc/maven/repository-manager/trunk/design/white-site/src/site/xdoc/admin/index.xml?rev=423778&r1=423777&r2=423778&view=diff
==============================================================================
---
maven/repository-manager/trunk/design/white-site/src/site/xdoc/admin/index.xml
(original)
+++
maven/repository-manager/trunk/design/white-site/src/site/xdoc/admin/index.xml
Wed Jul 19 22:32:53 2006
@@ -6,6 +6,29 @@
<h1>Administration</h1>
<div id="contentArea">
+ <h2>Configuration</h2>
+
+ <table>
+ <tr>
+ <th>Repository Directory</th>
+ <td>...</td>
+ <td></td>
+ </tr>
+ <tr>
+ <th>Indexing Schedule</th>
+ <td>...</td>
+ <td>
+ <a href="#">Run Now</a>
+ </td>
+ </tr>
+ <tr>
+ <td></td>
+ <td></td>
+ <td>
+ <a href="config.html">Edit Configuration</a>
+ </td>
+ </tr>
+ </table>
</div>
<div id="notes">
<p>Notes</p>
Modified:
maven/repository-manager/trunk/maven-repository-webapp/src/main/resources/xwork.xml
URL:
http://svn.apache.org/viewvc/maven/repository-manager/trunk/maven-repository-webapp/src/main/resources/xwork.xml?rev=423778&r1=423777&r2=423778&view=diff
==============================================================================
---
maven/repository-manager/trunk/maven-repository-webapp/src/main/resources/xwork.xml
(original)
+++
maven/repository-manager/trunk/maven-repository-webapp/src/main/resources/xwork.xml
Wed Jul 19 22:32:53 2006
@@ -62,10 +62,6 @@
<result name="proxyError" type="dispatcher">proxyError</result>
</action>
- <action name="search"
class="org.apache.maven.repository.manager.web.action.PackageSearchAction">
- <result name="success"
type="dispatcher">/WEB-INF/jsp/results.jsp</result>
- </action>
-
<action name="browse"
class="org.apache.maven.repository.manager.web.action.RepositoryBrowseAction">
<result name="success" type="dispatcher">/WEB-INF/jsp/browse.jsp</result>
<result name="error" type="dispatcher">/WEB-INF/jsp/browse.jsp</result>
@@ -77,17 +73,21 @@
<package name="admin" namespace="/admin" extends="webwork-default">
<default-interceptor-ref name="defaultStack"/>
+ <action name="index" class="configureAction" method="input">
+ <result name="input">/WEB-INF/jsp/admin/index.jsp</result>
+ </action>
+
<action name="configure" class="configureAction" method="input">
<result name="input">/WEB-INF/jsp/admin/configure.jsp</result>
</action>
<action name="saveConfiguration" class="configureAction">
<result name="input">/WEB-INF/jsp/admin/configure.jsp</result>
- <result>/WEB-INF/jsp/admin/configure.jsp</result>
+ <result>/WEB-INF/jsp/admin/index.jsp</result>
</action>
<action name="runIndexer" class="runIndexerAction">
- <!-- TODO: back to page where this comes from! -->
+ <result type="redirect">/admin/index.action</result>
</action>
</package>
</xwork>
Modified:
maven/repository-manager/trunk/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/configure.jsp
URL:
http://svn.apache.org/viewvc/maven/repository-manager/trunk/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/configure.jsp?rev=423778&r1=423777&r2=423778&view=diff
==============================================================================
---
maven/repository-manager/trunk/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/configure.jsp
(original)
+++
maven/repository-manager/trunk/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/configure.jsp
Wed Jul 19 22:32:53 2006
@@ -1,4 +1,3 @@
-<%@ taglib prefix="ww" uri="/webwork" %>
<%--
~ Copyright 2005-2006 The Apache Software Foundation.
~
@@ -14,6 +13,8 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
--%>
+
+<%@ taglib prefix="ww" uri="/webwork" %>
<html>
<head>
Added:
maven/repository-manager/trunk/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/index.jsp
URL:
http://svn.apache.org/viewvc/maven/repository-manager/trunk/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/index.jsp?rev=423778&view=auto
==============================================================================
---
maven/repository-manager/trunk/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/index.jsp
(added)
+++
maven/repository-manager/trunk/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/index.jsp
Wed Jul 19 22:32:53 2006
@@ -0,0 +1,51 @@
+<%--
+ ~ Copyright 2005-2006 The Apache Software Foundation.
+ ~
+ ~ 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
+ ~
+ ~ 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>Administration</title>
+ <ww:head />
+</head>
+
+<body>
+
+<h1>Administration</h1>
+
+<div id="contentArea">
+ <h2>Configuration</h2>
+ <table>
+ <tr>
+ <th>Repository Directory</th>
+ <td><ww:property value="repositoryDirectory" /></td>
+ <td></td>
+ </tr>
+ <tr>
+ <th>Indexing Schedule</th>
+ <td><ww:property value="indexerCronExpression" /></td>
+ <td><a href="<ww:url action="runIndexer" />">Run Now</a></td>
+ </tr>
+ <tr>
+ <td><a href="<ww:url action="configure" />">Edit Configuration</a></td>
+ <td></td>
+ <td></td>
+ </tr>
+ </table>
+</div>
+
+</body>
+</html>
\ No newline at end of file
Propchange:
maven/repository-manager/trunk/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/index.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/repository-manager/trunk/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/index.jsp
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified:
maven/repository-manager/trunk/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
URL:
http://svn.apache.org/viewvc/maven/repository-manager/trunk/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp?rev=423778&r1=423777&r2=423778&view=diff
==============================================================================
---
maven/repository-manager/trunk/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
(original)
+++
maven/repository-manager/trunk/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
Wed Jul 19 22:32:53 2006
@@ -95,7 +95,7 @@
--%>
<li class="expanded">
- <a href="#">Administration</a>
+ <my:currentWWUrl action="index"
namespace="/admin">Administration</my:currentWWUrl>
<ul>
<li class="none">
<my:currentWWUrl action="configure"
namespace="/admin">Configuration</my:currentWWUrl>
@@ -104,7 +104,7 @@
</li>
</ul>
-
+ <br />
</div>
</div>
