Author: oching
Date: Tue Mar 11 21:22:17 2008
New Revision: 636194
URL: http://svn.apache.org/viewvc?rev=636194&view=rev
Log:
[MRM-216]
-moved the artifact upload fields into a separate form
-added upload artifact in the navigation menu
Added:
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/uploadForm.jspf
Modified:
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/upload.jsp
Modified:
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp?rev=636194&r1=636193&r2=636194&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
(original)
+++
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
Tue Mar 11 21:22:17 2008
@@ -95,6 +95,10 @@
<li class="none">
<my:currentWWUrl action="browse" namespace="/">Browse</my:currentWWUrl>
</li>
+
+ <li class="none">
+ <my:currentWWUrl action="upload" namespace="/">Upload
Artifact</my:currentWWUrl>
+ </li>
</ul>
<redback:ifAnyAuthorized
permissions="archiva-manage-users,archiva-access-reports,archiva-manage-configuration">
Added:
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/uploadForm.jspf
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/uploadForm.jspf?rev=636194&view=auto
==============================================================================
---
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/uploadForm.jspf
(added)
+++
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/uploadForm.jspf
Tue Mar 11 21:22:17 2008
@@ -0,0 +1,33 @@
+<%--
+ ~ 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.
+ --%>
+
+<%--
http://www.opensymphony.com/webwork/wikidocs/File%20Upload%20Interceptor.html
--%>
+
+<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"; %>
+
+<ww:textfield name="groupId" label="Group Id" size="50" required="true"/>
+<ww:textfield name="artifactId" label="Artifact Id" size="50" required="true"/>
+<ww:textfield name="version" label="Version" size="50" required="true"/>
+<ww:textfield name="packaging" label="Packaging" size="50" required="true"/>
+<ww:textfield name="classifier" label="Classifier" size="50" required="false"/>
+<ww:select list="[EMAIL PROTECTED]@{'internal' : 'internal'}"
+ name="repositoryId" label="Repository Id"/>
+<ww:file name="upload" label="File"/>
+
Modified:
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/upload.jsp
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/upload.jsp?rev=636194&r1=636193&r2=636194&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/upload.jsp
(original)
+++
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/upload.jsp
Tue Mar 11 21:22:17 2008
@@ -21,8 +21,6 @@
<%@ taglib prefix="ww" uri="/webwork" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"; %>
-<%@ taglib prefix="archiva" uri="http://maven.apache.org/archiva"; %>
-<%@ taglib prefix="redback"
uri="http://plexus.codehaus.org/redback/taglib-1.0"; %>
<html>
<head>
@@ -35,16 +33,8 @@
<h1>Upload Artifact</h1>
<div id="contentArea">
<ww:form action="doUpload" method="post" enctype="multipart/form-data">
- <p>groupId: <input type="text" name="groupId" size="50" value=""
id="groupId"/></p>
- <p>artifactId: <input type="text" name="artifactId" size="50" value=""
id="artifactId"/></p>
- <p>version: <input type="text" name="version" size="50" value=""
id="version"/></p>
- <p>packaging: <input type="text" name="packaging" size="50" value=""
id="packaging"/></p>
- <p>classifier: <input type="text" name="classifier" size="50" value=""
id="classifier"/></p>
- <p>repositoryId: <input type="text" name="repositoryId" size="50" value=""
id="repositoryId"/></p>
- <p>
- <ww:file name="upload" label="File"/>
- <ww:submit/>
- </p>
+ <%@ include file="/WEB-INF/jsp/include/uploadForm.jspf" %>
+ <ww:submit/>
</ww:form>
</div>
