]> source.dussan.org Git - archiva.git/commitdiff
projects / archiva.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: fc91eda)
[MRM-216]
authorMaria Odea B. Ching <oching@apache.org>
Wed, 12 Mar 2008 04:22:17 +0000 (04:22 +0000)
committerMaria Odea B. Ching <oching@apache.org>
Wed, 12 Mar 2008 04:22:17 +0000 (04:22 +0000)
-moved the artifact upload fields into a separate form
-added upload artifact in the navigation menu

git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@636194 13f79535-47bb-0310-9956-ffa450edef68

archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp patch | blob | history
archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/uploadForm.jspf [new file with mode: 0644] patch | blob
archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/upload.jsp patch | blob | history

diff --git a/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp b/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
index 73e232074fe6425a8348389c9e365b7421cd22e2..679645c80e9129d915646e9a325d9132646ffff2 100644 (file)
--- a/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
+++ b/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
@@ -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">
diff --git a/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/uploadForm.jspf b/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/uploadForm.jspf
new file mode 100644 (file)
index 0000000..54f63c7
--- /dev/null
+++ b/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/uploadForm.jspf
@@ -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="#@java.util.LinkedHashMap@{'internal' : 'internal'}"
+          name="repositoryId" label="Repository Id"/>
+<ww:file name="upload" label="File"/>
+    
diff --git a/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/upload.jsp b/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/upload.jsp
index b6360da74b60a77eb32600e0ab4dbabcdad37e15..a2818052ccc5af354e6318262fb31fe4825fac66 100644 (file)
--- a/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/upload.jsp
+++ b/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/upload.jsp
@@ -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>
 
Apache Archiva Repository: https://github.com/apache/archiva