geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rwo...@apache.org
Subject svn commit: r1146965 - in /geronimo/server/trunk: framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/ plugins/console/console-base-portlets/ plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/...
Date Fri, 15 Jul 2011 05:50:37 GMT
Author: rwonly
Date: Fri Jul 15 05:50:36 2011
New Revision: 1146965

URL: http://svn.apache.org/viewvc?rev=1146965&view=rev
Log:
GERONIMO-5586 Modified the previous code logic so that it can work and add the ability to
install library cli

Modified:
    geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java
    geronimo/server/trunk/plugins/console/console-base-portlets/pom.xml
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/repository/RepositoryViewPortlet.java
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/repository/normal.jsp
    geronimo/server/trunk/plugins/console/console-tomcat/src/main/history/dependencies.xml

Modified: geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java?rev=1146965&r1=1146964&r2=1146965&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java
(original)
+++ geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java
Fri Jul 15 05:50:36 2011
@@ -52,6 +52,7 @@ import java.util.concurrent.ConcurrentHa
 import javax.security.auth.login.FailedLoginException;
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
+
 import org.apache.geronimo.gbean.ReferenceCollection;
 import org.apache.geronimo.gbean.ReferenceCollectionEvent;
 import org.apache.geronimo.gbean.ReferenceCollectionListener;
@@ -1134,19 +1135,107 @@ public class PluginInstallerGBean implem
     }
 
     public Artifact installLibrary(File libFile, String groupId) throws IOException {
-        Matcher matcher = MAVEN_1_PATTERN_PART.matcher("");
-        matcher.reset(libFile.getName());
-        if (matcher.matches()) {
-            String artifactId = matcher.group(1);
-            String version = matcher.group(2);
-            String type = matcher.group(3);
-            Artifact artifact = new Artifact(groupId != null ? groupId : Artifact.DEFAULT_GROUP_ID,
artifactId, version, type);
-            writeableRepo.copyToRepository(libFile, artifact, null);
-            return artifact;
+        Artifact artifact = calculateArtifact(libFile, libFile.getName(), groupId);
+        if (artifact == null)
+            throw new IllegalArgumentException("Can not calculate Artifact string, file should
be:\n"
+                    + "(1) a file with filename in the form <artifact>-<version>.<type>,
for e.g. mylib-1.0.jar;"
+                    + "(2) or an OSGi bundle");
+        installLibrary(libFile, artifact);
+        return artifact;
+    }
+
+    public void installLibrary(File libFile, Artifact artifact) throws IOException {
+        if (artifact == null || !artifact.isResolved())
+            throw new IllegalArgumentException("Artifact is not valid when install library");
+        
+        if (identifyOSGiBundle(libFile) != null) {
+            writeableRepo.copyToRepository(libFile, artifact, new RepoFileWriteMonitor());
         } else {
-            throw new IllegalArgumentException("Filename " + libFile.getName() + " is not
in the form <artifact>-<version>.<type>, for e.g. mylib-1.0.jar.");
+            // convert to osgi bundle jars using wrap url handler
+            URL wrap = new URL("wrap", null, libFile.toURI().toURL().toExternalForm() 
+                    + "$Bundle-SymbolicName=" + artifact.getArtifactId() 
+                    + "&Bundle-Version=" + artifact.getVersion().toString().replace("-",
"."));
+            InputStream in = null;
+            try {
+                in = wrap.openStream();
+                writeableRepo.copyToRepository(in, (int) libFile.getTotalSpace(), artifact,
new RepoFileWriteMonitor());
+            } finally {
+                if (in != null)
+                    in.close();
+            }
+        }
+    }
+    
+    private String[] identifyOSGiBundle(File file) throws IOException{
+        JarFile jar = null;
+        try {
+            jar = new JarFile(file);
+            Manifest manifest = jar.getManifest();
+            if (manifest != null &&
+                    manifest.getMainAttributes().getValue("Bundle-SymbolicName") != null
&&
+                    manifest.getMainAttributes().getValue("Bundle-Version") != null) {
+                return new String[]{
+                        manifest.getMainAttributes().getValue("Bundle-SymbolicName"),
+                        manifest.getMainAttributes().getValue("Bundle-Version")
+                        };
+            } 
+        } finally {
+            if (jar!=null) jar.close();
+        }
+        return null;
+    }
+        
+    private class RepoFileWriteMonitor implements FileWriteMonitor {
+        public void writeStarted(String fileDescription, int fileSize) {
+            log.info("Copying into repository " + fileDescription + "...");
+        }
+
+        public void writeProgress(int bytes) {
+        }
+
+        public void writeComplete(int bytes) {
+            log.info("Finished.");
+        }
+    }
+    
+    public Artifact calculateArtifact(File file, String fileName, String groupId) throws
IOException  {
+        if (groupId == null || groupId.isEmpty()) groupId = Artifact.DEFAULT_GROUP_ID;
+
+        if (fileName == null || fileName.isEmpty()) fileName = file.getName();
+        
+        String artifactId = null;
+        String version = null;
+        String fileType = null;
+        
+        // firstly, try calculate artifact string from the file name
+        Matcher matcher = MAVEN_1_PATTERN_PART.matcher(fileName);
+        if (matcher.matches()) {
+            artifactId = matcher.group(1);
+            version = matcher.group(2);
+            fileType = matcher.group(3);
+            
+            return new Artifact(groupId,artifactId,version,fileType);
+            
+        } else { //else try calculate if it is an OSGi bundle
+            String[] bundleKey = identifyOSGiBundle(file);
+            if (bundleKey != null){
+                artifactId = bundleKey[0]; //Bundle-SymbolicName
+                version = bundleKey[1]; //Bundle-Version
+
+                if (fileName.lastIndexOf(".") != -1) {
+                    fileType = fileName.substring(fileName.lastIndexOf(".") + 1);
+                } else {
+                    fileType = "jar";
+                }
+
+                return new Artifact(groupId, artifactId, version, fileType);
+                
+            } else {
+                return null;
+            }
         }
     }
+    
 
     /**
      * Download (if necessary) and install something, which may be a Configuration or may

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/pom.xml?rev=1146965&r1=1146964&r2=1146965&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/pom.xml (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/pom.xml Fri Jul 15 05:50:36
2011
@@ -65,6 +65,13 @@
         </dependency>
 
         <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-plugin</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-servlet_3.0_spec</artifactId>
             <scope>provided</scope>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/repository/RepositoryViewPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/repository/RepositoryViewPortlet.java?rev=1146965&r1=1146964&r2=1146965&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/repository/RepositoryViewPortlet.java
(original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/repository/RepositoryViewPortlet.java
Fri Jul 15 05:50:36 2011
@@ -33,6 +33,7 @@ import org.apache.geronimo.kernel.reposi
 import org.apache.geronimo.kernel.repository.FileWriteMonitor;
 import org.apache.geronimo.kernel.repository.ListableRepository;
 import org.apache.geronimo.kernel.repository.WriteableRepository;
+import org.apache.geronimo.system.plugin.PluginInstallerGBean;
 import org.apache.geronimo.system.resolver.ExplicitDefaultArtifactResolver;
 
 import javax.portlet.ActionRequest;
@@ -58,6 +59,8 @@ import java.util.SortedSet;
 import java.util.jar.Attributes;
 import java.util.jar.JarFile;
 import java.util.jar.Manifest;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 /**
  * @version $Rev$ $Date$
@@ -66,6 +69,9 @@ public class RepositoryViewPortlet exten
 
     private static final Logger log = LoggerFactory.getLogger(RepositoryViewPortlet.class);
 
+    // This regular expression for repository filename is taken from PluginInstallerGBean
+    private static final Pattern MAVEN_1_PATTERN_PART = Pattern.compile("(.+)-([0-9].+)\\.([^0-9]+)");
+   
     private Kernel kernel;
 
     private PortletContext ctx;
@@ -80,16 +86,15 @@ public class RepositoryViewPortlet exten
         super.init(portletConfig);
         kernel = KernelRegistry.getSingleKernel();
         ctx = portletConfig.getPortletContext();
-        normalView = ctx
-                .getRequestDispatcher("/WEB-INF/view/repository/normal.jsp");
-        helpView = ctx
-                .getRequestDispatcher("/WEB-INF/view/repository/help.jsp");
-        usageView = ctx
-                .getRequestDispatcher("/WEB-INF/view/repository/usage.jsp");
+        normalView = ctx.getRequestDispatcher("/WEB-INF/view/repository/normal.jsp");
+        helpView = ctx.getRequestDispatcher("/WEB-INF/view/repository/help.jsp");
+        usageView = ctx.getRequestDispatcher("/WEB-INF/view/repository/usage.jsp");
     }
 
-    public void processAction(ActionRequest actionRequest,
-                              ActionResponse actionResponse) throws PortletException, IOException
{
+    public void processAction(ActionRequest actionRequest, ActionResponse actionResponse)
throws PortletException, IOException {
+        
+        actionResponse.setRenderParameter("message", ""); // set to blank first
+        
         String action = actionRequest.getParameter("action");
         if(action != null && action.equals("usage")) {
             // User clicked on a repository entry to view usage
@@ -101,17 +106,17 @@ public class RepositoryViewPortlet exten
 
         try {
 
-            WriteableRepository repo = PortletManager.getCurrentServer(actionRequest).getWritableRepositories()[0];
-
-            File uploadFile = null;
             File file = null;
             String name = null;
             String basename = null;
-            String fileType = null;
-            String artifact = null;
+            
+            String specify = null;
+            
+            String groupId = null;
+            String artifactId = null;
             String version = null;
-            String group = null;
-            String jarName = null;
+            String fileType = null;
+            String replacedArtifactString = null;
 
             PortletFileUpload uploader = new PortletFileUpload(new DiskFileItemFactory());
             try {
@@ -119,7 +124,6 @@ public class RepositoryViewPortlet exten
                 for (Iterator i = items.iterator(); i.hasNext();) {
                     FileItem item = (FileItem) i.next();
                     if (!item.isFormField()) {
-                        String fieldName = item.getFieldName().trim();
                         name = item.getName().trim();
 
                         if (name.length() == 0) {
@@ -147,10 +151,6 @@ public class RepositoryViewPortlet exten
                             log.debug("Writing repository import file to " + file.getAbsolutePath());
                         }
 
-                        if ("local".equals(fieldName)) {
-                            uploadFile = file;
-                        }
-
                         if (file != null) {
                             try {
                                 item.write(file);
@@ -162,70 +162,46 @@ public class RepositoryViewPortlet exten
                     } else {
                         String fieldName = item.getFieldName().trim();
                         if ("group".equals(fieldName)) {
-                            group = item.getString().trim();
+                            groupId = item.getString().trim();
                         } else if ("artifact".equals(fieldName)) {
-                            artifact = item.getString().trim();
+                            artifactId = item.getString().trim();
                         } else if ("version".equals(fieldName)) {
                             version = item.getString().trim();
                         } else if ("fileType".equals(fieldName)) {
                             fileType = item.getString().trim();
                         } else if ("jarName".equals(fieldName)) {
-                            jarName = item.getString().trim();
+                            replacedArtifactString = item.getString().trim();
+                        } else if ("specify".equals(fieldName)) {
+                            specify = item.getString().trim();
                         }
                     }
                 }
-                if (jarName != null && jarName.length() > 0) {
+                
+                if (groupId == null || groupId.isEmpty()) groupId = "default";
+                PluginInstallerGBean installer = KernelRegistry.getSingleKernel().getGBean(PluginInstallerGBean.class);
+                Artifact artifact = null;
+                if ("yes".equals(specify)) {
+                    artifact = new Artifact(groupId, artifactId, version, fileType);
+                } else {
+                    artifact = installer.calculateArtifact(file, basename, groupId);
+                }
+                if (artifact==null) {
+                    addErrorMessage(actionRequest, "Can not calculate the Artifact string
automatically. Please manually specify one.");
+                    return;
+                }
+                
+                installer.installLibrary(file, artifact);
+                addInfoMessage(actionRequest, "File is successfully added to repository with
artifact string: " + artifact.toString());
+                
+                // add alias
+                if (replacedArtifactString != null && replacedArtifactString.length()
> 0) {
                     ExplicitDefaultArtifactResolver instance = KernelRegistry.getSingleKernel().getGBean(ExplicitDefaultArtifactResolver.class);
                     Properties set = new Properties();
-                    set.put(jarName, group + "/" + artifact + "/" + version + "/" + fileType);
+                    set.put(replacedArtifactString, artifact.toString());
                     instance.addAliases(set);
+                    addInfoMessage(actionRequest, "Replaced artifact: " + replacedArtifactString
+ " with: " + artifact.toString());
                 }
 
-                JarFile jar = new JarFile(file);
-                try {
-                    // only handle non OSGi jar
-                    Manifest manifest = jar.getManifest();
-                    if (manifest != null &&
-                        manifest.getMainAttributes().getValue(new Attributes.Name("Bundle-SymbolicName"))
!= null &&
-                        manifest.getMainAttributes().getValue(new Attributes.Name("Bundle-Version"))
!= null) {
-
-                        URL wrap = new URL("wrap", null, file.toURI().toURL().toExternalForm()
+ "$Bundle-SymbolicName=" + artifact + "&Bundle-Version=" + version.replace("-", "."));
-                        InputStream in = wrap.openStream();
-                        try {
-                            repo.copyToRepository(in, (int)file.getTotalSpace(), new Artifact(group,
artifact, version, fileType), new FileWriteMonitor() {
-                                public void writeStarted(String fileDescription, int fileSize)
{
-                                    log.info("Copying into repository " + fileDescription
+ "...");
-                                }
-
-                                public void writeProgress(int bytes) {
-                                }
-
-                                public void writeComplete(int bytes) {
-                                    log.info("Finished.");
-                                }
-                            });
-                        } finally {
-                            in.close();
-                        }
-                    } else {
-                        repo.copyToRepository(file, new Artifact(group, artifact, version,
fileType), new FileWriteMonitor() {
-                            public void writeStarted(String fileDescription, int fileSize)
{
-                                log.info("Copying into repository " + fileDescription + "...");
-                            }
-
-                            public void writeProgress(int bytes) {
-                            }
-
-                            public void writeComplete(int bytes) {
-                                log.info("Finished.");
-                            }
-                        });
-                    }
-                } finally {
-                    jar.close();
-                }
-
-
             } catch (FileUploadException e) {
                 throw new PortletException(e);
             } catch (GBeanNotFoundException e) {
@@ -239,7 +215,7 @@ public class RepositoryViewPortlet exten
             throw e;
         }
     }
-
+        
     protected void doView(RenderRequest request, RenderResponse response)
             throws PortletException, IOException {
         // i think generic portlet already does this

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/repository/normal.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/repository/normal.jsp?rev=1146965&r1=1146964&r2=1146965&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/repository/normal.jsp
(original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/repository/normal.jsp
Fri Jul 15 05:50:36 2011
@@ -20,6 +20,7 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<%@ taglib uri="/WEB-INF/CommonMsg.tld" prefix="CommonMsg"%>
 <fmt:setBundle basename="consolebase"/>
 <portlet:defineObjects/>
 
@@ -32,14 +33,20 @@
 	
     div.Shown {
         display: block;
-    font-size: 10px;
+        font-size: 10px;
     }
 </style>  
 
 <script language="JavaScript">
-var <portlet:namespace/>formName = "<portlet:namespace/>fileSelect";
-var <portlet:namespace/>requiredFields = new Array("local", "group", "artifact", "version",
"fileType");
+
 function <portlet:namespace/>validateForm() {
+    var <portlet:namespace/>formName = "<portlet:namespace/>fileSelect";
+    var <portlet:namespace/>requiredFields = new Array("local");
+    
+    if(document.getElementById("specify").checked){
+        <portlet:namespace/>requiredFields = new Array("local", "artifact", "version",
"fileType");
+    }
+    
     if(!textElementsNotEmpty(<portlet:namespace/>formName,<portlet:namespace/>requiredFields))
{
         addErrorMessage("<portlet:namespace/>", '<fmt:message key="repository.normal.emptyText"/>');
         return false;    
@@ -112,57 +119,83 @@ function <portlet:namespace/>parse(local
         document.<portlet:namespace/>fileSelect.group.value = '';
     }
 }
-
 </script>
 
-<div id="<portlet:namespace/>CommonMsgContainer"></div><br>
+<script>
+function showHideByCheckbox(cb,target){
+    if (cb.checked)
+	    document.getElementById(target).style.display='block';
+	else
+	    document.getElementById(target).style.display='none';
+}
+</script>
 
-<table width="100%">
-<tr>
-  <td align="center">
-  <form onsubmit="return <portlet:namespace/>validateForm();" enctype="multipart/form-data"
name="<portlet:namespace/>fileSelect" method="POST" action="<portlet:actionURL/>">
+<!-- js's common msg -->
+<div id="<portlet:namespace/>CommonMsgContainer"></div>
+<!-- portlet's common msg -->
+<CommonMsg:commonMsg/>
+<br/>
+<form onsubmit="return <portlet:namespace/>validateForm();" enctype="multipart/form-data"
name="<portlet:namespace/>fileSelect" method="POST" action="<portlet:actionURL/>">
   <input type="hidden" value="deploy" name="action"/>
-  <table width="80%">
-    <tr>
-      <th colspan="2" align="center"><fmt:message key="repository.normal.addArchiveToRepository"/></th>
-    </tr>
-    <tr>
-      <td align="right" width="40%"><label for="<portlet:namespace/>local"><fmt:message
key="consolebase.common.file"/></label></td>
-      <td align="left" width="60%"><input name="local" id="<portlet:namespace/>local"
onchange="<portlet:namespace/>parse(value);" type="file">&nbsp;&nbsp;&nbsp;</td>
-    </tr>
-    <tr>
-      <td align="right" width="40%"><label for="<portlet:namespace/>group"><fmt:message
key="consolebase.common.group"/></label>:</td>
-      <td align="left" width="60%"><input type="text" name="group" id="<portlet:namespace/>group"
value="${group}"/></td>
-    </tr>
-    <tr>
-      <td align="right" width="40%"><label for="<portlet:namespace/>artifact"><fmt:message
key="repository.normal.artifact"/></label>:</td>
-      <td align="left" width="60%"><input type="text" name="artifact" id="<portlet:namespace/>artifact"
value="${artifact}"/></td>
-    </tr>
-    <tr>
-      <td align="right" width="40%"><label for="<portlet:namespace/>version"><fmt:message
key="consolebase.common.version"/></label>:</td>
-      <td align="left" width="60%"><input type="text" name="version" id="<portlet:namespace/>version"
value="${version}"/></td>
-    </tr>
-    <tr>
-      <td align="right" width="40%"><label for="<portlet:namespace/>fileType"><fmt:message
key="consolebase.common.type"/></label>:</td>
-      <td align="left" width="60%"><input type="text" name="fileType" id="<portlet:namespace/>fileType"
value="${fileType}"/></td>
-    </tr>
-    <tr>
-      <td align="right" width="40%"><label for="<portlet:namespace/>jarName"><fmt:message
key="repository.normal.replacedName"/></label>:</td>
-      <td align="left" width="60%"><input type="text" name="jarName" id="<portlet:namespace/>jarName"
value="${jarName}"/></td>
-    </tr>
-    <tr>
-      <td align="right" width="40%">&nbsp;</td>
-      <td align="left" width="60%"><fmt:message key="repository.normal.replacedNameDescription"/></td>
-    </tr>    
-    <tr><td colspan="2"><font size="-2">&nbsp;</font></td></tr>
-    <tr>
-      <td colspan="2" align="center"><input type="submit" value='<fmt:message
key="consolebase.common.install"/>' /></td>
+  <table width="100%" class="TableLine">
+    <tr class="DarkBackground">
+        <th scope="col" colspan="3" width="40" align="center"><fmt:message key="repository.normal.addArchiveToRepository"/></th>
  
+    </tr>
+    <tr class="LightBackground">
+      <td align="right" width="20%"><label for="<portlet:namespace/>local"><fmt:message
key="consolebase.common.file"/></label>:</td>
+      <td><input type="file" name="local" id="<portlet:namespace/>local" onchange="<portlet:namespace/>parse(value)"></td>
+      <td>If the file is a normal jar file, it will be automatically convert to an
OSGi bundle</td>
+    </tr>
+    <tr class="MediumBackground">
+      <td align="right" width="20%">Artifact string:</td>
+      <td>
+        <table width="100%">
+            <tr>
+              <td align="right" width="50"><label for="<portlet:namespace/>group"><fmt:message
key="consolebase.common.group"/></label>:</td>
+              <td align="left"><input type="text" name="group" id="<portlet:namespace/>group"
value="${group}" /></td>
+            </tr>
+            <tr>
+              <td align="right"></td>
+              <td align="left">
+                <input type="checkbox" name="specify" id="specify" value="yes" onChange="showHideByCheckbox(this,'specifyTb')"/>
Specify other parts
+              </td>
+            </tr>
+        </table>
+        <table width="100%" id="specifyTb" style="display:none">
+            <tr>
+              <td align="right" width="50"><label for="<portlet:namespace/>artifact"><fmt:message
key="repository.normal.artifact"/></label>:</td>
+              <td align="left"><input type="text" name="artifact" id="<portlet:namespace/>artifact"
value="${artifact}"/></td>
+            </tr>
+            <tr>
+              <td align="right" width="50"><label for="<portlet:namespace/>version"><fmt:message
key="consolebase.common.version"/></label>:</td>
+              <td align="left"><input type="text" name="version" id="<portlet:namespace/>version"
value="${version}"/></td>
+            </tr>
+            <tr>
+              <td align="right" width="50"><label for="<portlet:namespace/>fileType"><fmt:message
key="consolebase.common.type"/></label>:</td>
+              <td align="left"><input type="text" name="fileType" id="<portlet:namespace/>fileType"
value="${fileType}"/></td>
+            </tr>
+         </table>
+      </td>
+      <td>
+        The default groupId is "default".<br/>
+        The other parts could be calculated automatically, if:<br/>
+        (1) the file name has the following form: &lt;artifact&gt;-&lt;version&gt;.&lt;type&gt;,
for e.g. mylib-1.0.jar;<br/>
+        (2) or the file is an OSGi bundle, then the artifactId is its Bundle-SymbolicName
and the version is its Bundle-Version; <br/>
+      </td>
+    </tr>
+    <tr class="LightBackground">
+      <td align="right" width="20%"><label for="<portlet:namespace/>jarName"><fmt:message
key="repository.normal.replacedName"/></label>:</td>
+      <td><input type="text" name="jarName" id="<portlet:namespace/>jarName"
value="${jarName}" style="width:230px" /></td>
+      <td><fmt:message key="repository.normal.replacedNameDescription"/></td>
+    </tr>
+    <tr class="MediumBackground">
+      <td width="20%"></td>
+      <td><input type="submit" value='<fmt:message key="consolebase.common.install"/>'
/></td>
+      <td></td>
     </tr>
   </table>
-  </form>
-  </td>
-</tr>
-</table>
+</form>
+
 
 <b><fmt:message key="repository.normal.currentRepositoryEntries"/></b>
 <p><fmt:message key="repository.normal.toViewUsage"/></p>

Modified: geronimo/server/trunk/plugins/console/console-tomcat/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-tomcat/src/main/history/dependencies.xml?rev=1146965&r1=1146964&r2=1146965&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-tomcat/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/plugins/console/console-tomcat/src/main/history/dependencies.xml
Fri Jul 15 05:50:36 2011
@@ -57,11 +57,6 @@
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-bval</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>console-core</artifactId>
         <type>jar</type>
@@ -77,16 +72,6 @@
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-jms_1.1_spec</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.tranql</groupId>
         <artifactId>tranql-connector</artifactId>
         <type>jar</type>



Mime
View raw message