geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r429088 [2/7] - in /geronimo/branches/dain/notcm: ./ applications/ applications/console/ applications/console/console-core/ applications/console/console-ear/ applications/console/console-framework/ applications/console/console-framework/src...
Date Sun, 06 Aug 2006 01:47:20 GMT
Modified: geronimo/branches/dain/notcm/applications/console/console-standard/src/java/org/apache/geronimo/console/car/ImportExportPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/applications/console/console-standard/src/java/org/apache/geronimo/console/car/ImportExportPortlet.java?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/applications/console/console-standard/src/java/org/apache/geronimo/console/car/ImportExportPortlet.java (original)
+++ geronimo/branches/dain/notcm/applications/console/console-standard/src/java/org/apache/geronimo/console/car/ImportExportPortlet.java Sat Aug  5 18:47:06 2006
@@ -39,6 +39,8 @@
         addHelper(new ExportHandler(), config);
         addHelper(new DownloadStatusHandler(), config);
         addHelper(new UpdateListHandler(), config);
+        addHelper(new AddRepositoryHandler(), config);
+        addHelper(new ViewPluginDownloadHandler(), config);
     }
 
     protected String getModelJSPVariableName() {

Modified: geronimo/branches/dain/notcm/applications/console/console-standard/src/java/org/apache/geronimo/console/car/ListHandler.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/applications/console/console-standard/src/java/org/apache/geronimo/console/car/ListHandler.java?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/applications/console/console-standard/src/java/org/apache/geronimo/console/car/ListHandler.java (original)
+++ geronimo/branches/dain/notcm/applications/console/console-standard/src/java/org/apache/geronimo/console/car/ListHandler.java Sat Aug  5 18:47:06 2006
@@ -67,7 +67,9 @@
         String repository = request.getParameter("repository");
         String user = request.getParameter("repo-user");
         String pass = request.getParameter("repo-pass");
-        loadFromRepository(request, repository, user, pass);
+        if(!loadFromRepository(request, repository, user, pass)) {
+            //todo: loading failed -- do something!
+        }
         request.setAttribute("repository", repository);
         request.setAttribute("repouser", user);
         request.setAttribute("repopass", pass);
@@ -77,7 +79,7 @@
         return getMode()+BEFORE_ACTION;
     }
 
-    private void loadFromRepository(RenderRequest request, String repository, String username, String password) throws IOException, PortletException {
+    private boolean loadFromRepository(RenderRequest request, String repository, String username, String password) throws IOException, PortletException {
         PluginList data;
         try {
             data = PortletManager.getCurrentServer(request).getPluginInstaller().listPlugins(new URL(repository), username, password);
@@ -85,6 +87,9 @@
             throw new PortletException("Invalid login for Maven repository '"+repository+"'", e);
         }
         Map results = new HashMap();
+        if(data == null || data.getPlugins() == null) {
+            return false;
+        }
         for (int i = 0; i < data.getPlugins().length; i++) {
             PluginMetadata metadata = data.getPlugins()[i];
             List values = (List) results.get(metadata.getCategory());
@@ -101,5 +106,6 @@
         }
         request.setAttribute("categories", results);
         request.getPortletSession(true).setAttribute(CONFIG_LIST_SESSION_KEY, data);
+        return true;
     }
 }

Modified: geronimo/branches/dain/notcm/applications/console/console-standard/src/java/org/apache/geronimo/console/configmanager/DeploymentPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/applications/console/console-standard/src/java/org/apache/geronimo/console/configmanager/DeploymentPortlet.java?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/applications/console/console-standard/src/java/org/apache/geronimo/console/configmanager/DeploymentPortlet.java (original)
+++ geronimo/branches/dain/notcm/applications/console/console-standard/src/java/org/apache/geronimo/console/configmanager/DeploymentPortlet.java Sat Aug  5 18:47:06 2006
@@ -38,7 +38,6 @@
 import javax.portlet.RenderRequest;
 import javax.portlet.RenderResponse;
 import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
 
 import org.apache.commons.fileupload.FileItem;
 import org.apache.commons.fileupload.FileUploadException;
@@ -49,6 +48,7 @@
 import org.apache.geronimo.deployment.plugin.ConfigIDExtractor;
 import org.apache.geronimo.common.DeploymentException;
 import org.apache.geronimo.kernel.repository.Artifact;
+import org.apache.geronimo.kernel.util.XmlUtil;
 import org.apache.geronimo.upgrade.Upgrade1_0To1_1;
 import org.w3c.dom.Document;
 
@@ -164,7 +164,7 @@
                             byte[] plan = new byte[(int) planFile.length()];
                             fis = new FileInputStream(planFile);
                             fis.read(plan);
-                            DocumentBuilder documentBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
+                            DocumentBuilder documentBuilder = XmlUtil.newDocumentBuilderFactory().newDocumentBuilder();
                             Document doc = documentBuilder.parse(new ByteArrayInputStream(plan));
                             // v1.1 switched from configId to moduleId
                             String configId = doc.getDocumentElement().getAttribute("configId");

Modified: geronimo/branches/dain/notcm/applications/console/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/applications/console/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/applications/console/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java (original)
+++ geronimo/branches/dain/notcm/applications/console/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java Sat Aug  5 18:47:06 2006
@@ -96,6 +96,7 @@
 import org.apache.geronimo.kernel.repository.ListableRepository;
 import org.apache.geronimo.kernel.repository.Repository;
 import org.apache.geronimo.kernel.repository.WriteableRepository;
+import org.apache.geronimo.kernel.util.XmlUtil;
 import org.apache.geronimo.management.geronimo.JCAManagedConnectionFactory;
 import org.apache.geronimo.management.geronimo.ResourceAdapterModule;
 import org.w3c.dom.Document;
@@ -551,7 +552,7 @@
     private ResourceAdapterParams loadConfigPropertiesByAbstractName(PortletRequest request, String abstractName) {
         ResourceAdapterModule module = (ResourceAdapterModule) PortletManager.getManagedBean(request, new AbstractName(URI.create(abstractName)));
         String dd = module.getDeploymentDescriptor();
-        DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+        DocumentBuilderFactory factory = XmlUtil.newDocumentBuilderFactory();
         factory.setValidating(false);
         factory.setNamespaceAware(true);
         try {

Modified: geronimo/branches/dain/notcm/applications/console/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/JMSProviderData.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/applications/console/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/JMSProviderData.java?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/applications/console/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/JMSProviderData.java (original)
+++ geronimo/branches/dain/notcm/applications/console/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/JMSProviderData.java Sat Aug  5 18:47:06 2006
@@ -36,6 +36,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.geronimo.console.util.PortletManager;
+import org.apache.geronimo.kernel.util.XmlUtil;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
@@ -218,7 +219,7 @@
         try {
             while((entry = in.getNextEntry()) != null) {
                 if(entry.getName().equals("META-INF/ra.xml")) {
-                    DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+                    DocumentBuilderFactory factory = XmlUtil.newDocumentBuilderFactory();
                     factory.setValidating(false);
                     DocumentBuilder builder = factory.newDocumentBuilder();
                     doc = builder.parse(in);

Modified: geronimo/branches/dain/notcm/applications/console/console-standard/src/java/org/apache/geronimo/console/keystores/BaseKeystoreHandler.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/applications/console/console-standard/src/java/org/apache/geronimo/console/keystores/BaseKeystoreHandler.java?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/applications/console/console-standard/src/java/org/apache/geronimo/console/keystores/BaseKeystoreHandler.java (original)
+++ geronimo/branches/dain/notcm/applications/console/console-standard/src/java/org/apache/geronimo/console/keystores/BaseKeystoreHandler.java Sat Aug  5 18:47:06 2006
@@ -16,24 +16,28 @@
  */
 package org.apache.geronimo.console.keystores;
 
-import java.io.FileInputStream;
+import java.io.ByteArrayInputStream;
 import java.io.FileNotFoundException;
 import java.io.InputStream;
 import java.io.Serializable;
+import java.security.cert.Certificate;
 import java.security.cert.CertificateException;
 import java.security.cert.CertificateFactory;
 import java.security.cert.X509Certificate;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
+
 import javax.portlet.ActionResponse;
 import javax.portlet.PortletRequest;
 import javax.portlet.PortletSession;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.geronimo.console.MultiPageAbstractHandler;
 import org.apache.geronimo.console.MultiPageModel;
 import org.apache.geronimo.management.geronimo.KeystoreInstance;
+import org.apache.geronimo.management.geronimo.KeystoreIsLocked;
 import org.apache.geronimo.util.CertificateUtil;
 
 /**
@@ -56,6 +60,11 @@
     protected static final String CONFIRM_CERTIFICATE = "confirmCertificate";
     protected static final String CONFIGURE_KEY = "configureKey";
     protected static final String CONFIRM_KEY = "confirmKey";
+    protected static final String CERTIFICATE_DETAILS = "certificateDetails";
+    protected static final String GENERATE_CSR = "generateCSR";
+    protected static final String IMPORT_CA_REPLY = "importCAReply";
+    protected static final String DELETE_ENTRY = "deleteEntry";
+    
 
     protected BaseKeystoreHandler(String mode, String viewName) {
         super(mode, viewName);
@@ -75,6 +84,7 @@
         private String[] certificates;
         private String[] keys;
         private Map fingerprints;
+        private Map keyPasswords;
 
         public KeystoreInstance getInstance() {
             return instance;
@@ -90,6 +100,7 @@
                 certificates = null;
                 keys = null;
                 fingerprints = null;
+                keyPasswords = null;
             }
         }
 
@@ -137,7 +148,9 @@
         }
 
         public boolean importTrustCert(String fileName, String alias) throws FileNotFoundException, CertificateException {
-            InputStream is = new FileInputStream(fileName);
+            // Uploading certificate using a disk file fails on Windows.  Certificate text is used instead.
+            //InputStream is = new FileInputStream(fileName);
+            InputStream is = new ByteArrayInputStream(fileName.getBytes());
             CertificateFactory cf = CertificateFactory.getInstance("X.509");
             Collection certs = cf.generateCertificates(is);
             X509Certificate cert = (X509Certificate) certs.iterator().next();
@@ -180,5 +193,63 @@
             }
             return result;
         }
+
+        public Certificate getCertificate(String alias) {
+            return instance.getCertificate(alias, password);
+        }
+
+        public void unlockPrivateKey(String alias, char[] keyPassword) throws KeystoreIsLocked {
+            if(keyPasswords == null) {
+                keyPasswords = new HashMap();
+            }
+            
+            if(instance.unlockPrivateKey(alias, keyPassword)) {
+                keyPasswords.put(alias, keyPassword);
+            }
+        }
+
+        public void deleteEntry(String alias) {
+            for(int i = 0; i < keys.length; ++i) {
+                if(keys[i].equals(alias)) {
+                    String[] temp = new String[keys.length-1];
+                    for(int j = 0; j < i; ++j) {
+                        temp[j] = keys[j];
+                    }
+                    for(int j = i+1; j < keys.length; ++j) {
+                        temp[j-1] = keys[j];
+                    }
+                    keys = temp;
+                    break;
+                }
+            }
+
+            for(int i = 0; i < certificates.length; ++i) {
+                if(certificates[i].equals(alias)) {
+                    String[] temp = new String[certificates.length-1];
+                    for(int j = 0; j < i; ++j) {
+                        temp[j] = certificates[j];
+                    }
+                    for(int j = i+1; j < certificates.length; ++j) {
+                        temp[j-1] = certificates[j];
+                    }
+                    certificates = temp;
+                    break;
+                }
+            }
+            instance.deleteEntry(alias);
+            if(keyPasswords != null)
+                keyPasswords.remove(alias);
+            if(fingerprints != null)
+                fingerprints.remove(alias);
+        }
+
+		public void importPKCS7Certificate(String alias, String pkcs7cert) {
+			try {
+				instance.importPKCS7Certificate(alias, pkcs7cert);
+				fingerprints.put(alias, CertificateUtil.generateFingerprint(instance.getCertificate(alias, password), "MD5"));
+			} catch (Exception e) {
+				log.error("Error importing CA reply", e);
+			}
+		}
     }
 }

Modified: geronimo/branches/dain/notcm/applications/console/console-standard/src/java/org/apache/geronimo/console/keystores/ConfirmCertificateHandler.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/applications/console/console-standard/src/java/org/apache/geronimo/console/keystores/ConfirmCertificateHandler.java?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/applications/console/console-standard/src/java/org/apache/geronimo/console/keystores/ConfirmCertificateHandler.java (original)
+++ geronimo/branches/dain/notcm/applications/console/console-standard/src/java/org/apache/geronimo/console/keystores/ConfirmCertificateHandler.java Sat Aug  5 18:47:06 2006
@@ -26,6 +26,8 @@
 import javax.portlet.PortletException;
 import javax.portlet.RenderRequest;
 import javax.portlet.RenderResponse;
+
+import java.io.ByteArrayInputStream;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -56,9 +58,14 @@
         SimpleDateFormat sdf = new SimpleDateFormat("MM/dd/yyyy");
         request.setAttribute("id", request.getParameter("id"));
         request.setAttribute("alias", request.getParameter("alias"));
+        /*  // Uploading certificate using a disk file fails on Windows.  Certificate text is used instead.
         String certFile = request.getParameter("certificate");
         request.setAttribute("certificate", certFile);
         InputStream is = new FileInputStream(certFile);
+        */
+        String certificate = request.getParameter("certificate");
+        request.setAttribute("certificate", certificate);
+        InputStream is = new ByteArrayInputStream(certificate.getBytes());
         try {
             CertificateFactory cf = CertificateFactory.getInstance("X.509");
             Collection certificates = cf.generateCertificates(is);

Modified: geronimo/branches/dain/notcm/applications/console/console-standard/src/java/org/apache/geronimo/console/keystores/KeystoresPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/applications/console/console-standard/src/java/org/apache/geronimo/console/keystores/KeystoresPortlet.java?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/applications/console/console-standard/src/java/org/apache/geronimo/console/keystores/KeystoresPortlet.java (original)
+++ geronimo/branches/dain/notcm/applications/console/console-standard/src/java/org/apache/geronimo/console/keystores/KeystoresPortlet.java Sat Aug  5 18:47:06 2006
@@ -43,6 +43,10 @@
         addHelper(new LockEditKeystoreHandler(), config);
         addHelper(new LockKeystoreHandler(), config);
         addHelper(new UnlockKeyHandler(), config);
+        addHelper(new CertificateDetailsHandler(), config);
+        addHelper(new GenerateCSRHandler(), config);
+        addHelper(new ImportCAReplyHandler(), config);
+        addHelper(new DeleteEntryHandler(), config);
     }
 
     protected String getModelJSPVariableName() {

Modified: geronimo/branches/dain/notcm/applications/console/console-standard/src/java/org/apache/geronimo/console/keystores/UnlockKeyHandler.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/applications/console/console-standard/src/java/org/apache/geronimo/console/keystores/UnlockKeyHandler.java?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/applications/console/console-standard/src/java/org/apache/geronimo/console/keystores/UnlockKeyHandler.java (original)
+++ geronimo/branches/dain/notcm/applications/console/console-standard/src/java/org/apache/geronimo/console/keystores/UnlockKeyHandler.java Sat Aug  5 18:47:06 2006
@@ -57,7 +57,8 @@
         }
         KeystoreData data = ((KeystoreData) request.getPortletSession(true).getAttribute(KEYSTORE_DATA_PREFIX + keystore));
         try {
-            data.getInstance().unlockPrivateKey(alias, keyPassword.toCharArray());
+            //data.getInstance().unlockPrivateKey(alias, keyPassword.toCharArray());
+            data.unlockPrivateKey(alias, keyPassword.toCharArray());
         } catch (KeystoreIsLocked e) {
             throw new PortletException("Invalid password for keystore", e);
         }

Modified: geronimo/branches/dain/notcm/applications/console/console-standard/src/java/org/apache/geronimo/console/keystores/UploadCertificateHandler.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/applications/console/console-standard/src/java/org/apache/geronimo/console/keystores/UploadCertificateHandler.java?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/applications/console/console-standard/src/java/org/apache/geronimo/console/keystores/UploadCertificateHandler.java (original)
+++ geronimo/branches/dain/notcm/applications/console/console-standard/src/java/org/apache/geronimo/console/keystores/UploadCertificateHandler.java Sat Aug  5 18:47:06 2006
@@ -58,6 +58,7 @@
         if(alias == null) {
             return getMode()+BEFORE_ACTION; //todo: some kind of error message
         }
+        /*  // Uploading certificate using a disk file fails on Windows.  Certificate text is used instead.
         File certFile;
         FileItem item = (FileItem) getUploadFiles().get("certificate");
         if(item != null) {
@@ -72,8 +73,11 @@
             response.setRenderParameter("id", id);
             return getMode()+BEFORE_ACTION;
         }
+        */
         response.setRenderParameter("id", id); // the Keystore
-        response.setRenderParameter("certificate", certFile.getAbsolutePath());
+        // Uploading certificate using a disk file fails on Windows.  Certificate text is used instead.
+        //response.setRenderParameter("certificate", certFile.getAbsolutePath());
+        response.setRenderParameter("certificate", getUploadFields().getProperty("certificate"));
         response.setRenderParameter("alias", alias);
 
         return CONFIRM_CERTIFICATE+BEFORE_ACTION;

Modified: geronimo/branches/dain/notcm/applications/console/console-standard/src/webapp/WEB-INF/view/car/download.jsp
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/applications/console/console-standard/src/webapp/WEB-INF/view/car/download.jsp?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/applications/console/console-standard/src/webapp/WEB-INF/view/car/download.jsp (original)
+++ geronimo/branches/dain/notcm/applications/console/console-standard/src/webapp/WEB-INF/view/car/download.jsp Sat Aug  5 18:47:06 2006
@@ -1,4 +1,3 @@
-<%@ page import="org.apache.geronimo.console.util.PortletManager"%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>

Modified: geronimo/branches/dain/notcm/applications/console/console-standard/src/webapp/WEB-INF/view/car/index.jsp
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/applications/console/console-standard/src/webapp/WEB-INF/view/car/index.jsp?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/applications/console/console-standard/src/webapp/WEB-INF/view/car/index.jsp (original)
+++ geronimo/branches/dain/notcm/applications/console/console-standard/src/webapp/WEB-INF/view/car/index.jsp Sat Aug  5 18:47:06 2006
@@ -27,7 +27,8 @@
         </c:forEach>
     </select>
     <c:if test="${!empty repositories}"><br /></c:if>
-    <i>(<a href="<portlet:actionURL portletMode="view"><portlet:param name="mode" value="updateList-before" /><portlet:param name="repository" value="${repository}" /></portlet:actionURL>">Update Repository List</a>)</i>
+    <i>(<a href="<portlet:actionURL portletMode="view"><portlet:param name="mode" value="updateList-before" /><portlet:param name="repository" value="${repository}" /></portlet:actionURL>">Update Repository List</a>
+     or <a href="<portlet:actionURL portletMode="view"><portlet:param name="mode" value="addRepository-before" /><portlet:param name="repository" value="${repository}" /></portlet:actionURL>">Add Repository</a>)</i>
     <%--<input type="text" name="repository" value="${repository}" size="30" maxlength="200" />--%>
     <c:if test="${!empty repositories}">
       <input type="submit" value="Search for Plugins" />

Modified: geronimo/branches/dain/notcm/applications/console/console-standard/src/webapp/WEB-INF/view/car/list.jsp
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/applications/console/console-standard/src/webapp/WEB-INF/view/car/list.jsp?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/applications/console/console-standard/src/webapp/WEB-INF/view/car/list.jsp (original)
+++ geronimo/branches/dain/notcm/applications/console/console-standard/src/webapp/WEB-INF/view/car/list.jsp Sat Aug  5 18:47:06 2006
@@ -1,4 +1,3 @@
-<%@ page import="org.apache.geronimo.console.util.PortletManager"%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
@@ -21,19 +20,20 @@
                       (already installed)
                   </c:when>
                   <c:otherwise>
-                      <c:if test="${!entry.eligible}">
+<%--                      <c:if test="${!entry.eligible}">
                           <c:forEach var="prereq" items="${entry.prerequisites}">
                               <c:if test="${!prereq.present}">
                                   (${prereq.moduleIdWithStars} is not installed)
                               </c:if>
                           </c:forEach>
-                      </c:if>
+                      </c:if>--%>
+                      (Not available; <a href="<portlet:actionURL><portlet:param name="configId" value="${entry.moduleId}"/><portlet:param name="repository" value="${repository}"/><portlet:param name="repo-user" value="${repouser}"/><portlet:param name="repo-pass" value="${repopass}"/><portlet:param name="mode" value="viewForDownload-before"/></portlet:actionURL>">View Details</a>)
                   </c:otherwise>
               </c:choose>
           </li>
         </c:when>
         <c:otherwise>
-          <li><a href="<portlet:actionURL><portlet:param name="configId" value="${entry.moduleId}"/><portlet:param name="repository" value="${repository}"/><portlet:param name="repo-user" value="${repouser}"/><portlet:param name="repo-pass" value="${repopass}"/><portlet:param name="mode" value="download-before"/></portlet:actionURL>">${entry.name}<c:if test="${entry.name ne entry.moduleId}"> (${entry.version})</c:if></a></li>
+          <li><a href="<portlet:actionURL><portlet:param name="configId" value="${entry.moduleId}"/><portlet:param name="repository" value="${repository}"/><portlet:param name="repo-user" value="${repouser}"/><portlet:param name="repo-pass" value="${repopass}"/><portlet:param name="mode" value="viewForDownload-before"/></portlet:actionURL>">${entry.name}<c:if test="${entry.name ne entry.moduleId}"> (${entry.version})</c:if></a></li>
         </c:otherwise>
       </c:choose>
     </c:forEach>

Modified: geronimo/branches/dain/notcm/applications/console/console-standard/src/webapp/WEB-INF/view/keystore/uploadCertificate.jsp
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/applications/console/console-standard/src/webapp/WEB-INF/view/keystore/uploadCertificate.jsp?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/applications/console/console-standard/src/webapp/WEB-INF/view/keystore/uploadCertificate.jsp (original)
+++ geronimo/branches/dain/notcm/applications/console/console-standard/src/webapp/WEB-INF/view/keystore/uploadCertificate.jsp Sat Aug  5 18:47:06 2006
@@ -3,28 +3,49 @@
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
 <portlet:defineObjects/>
 
+<script language="JavaScript">
+var <portlet:namespace/>formName = "<portlet:namespace/>KeystoreForm";
+var <portlet:namespace/>requiredFields = new Array("alias");
+function <portlet:namespace/>validateForm(){
+    return textElementsNotEmpty(<portlet:namespace/>formName,<portlet:namespace/>requiredFields);
+}
+</script>
+
+<!-- Uploading certificate using a disk file fails on Windows.  Certificate text is used instead.
 <p>This screen lets you select a certificate to import into the keystore.  Select the
 certificate file and specify an alias to store it under in the keystore.  The next
 step will be to review the certificate before committing it to the keystore.</p>
+-->
+<p>This screen lets you input a certificate to import into the keystore.  Paste the content of the
+certificate file in the text area and specify an alias to store it under in the keystore.  The next
+step will let you review the certificate before committing it to the keystore.</p>
 
 <form enctype="multipart/form-data" method="POST" name="<portlet:namespace/>KeystoreForm" action="<portlet:actionURL/>">
     <input type="hidden" name="id" value="${id}" />
     <input type="hidden" name="mode" value="uploadCertificate-after" />
     <table border="0">
+        <th align="left"> Trusted Certificate </th>
+<!-- Uploading certificate using a disk file fails on Windows.  Certificate text is used instead.
         <tr>
             <th align="right">Certificate file:</th>
             <td>
                 <input type="file" name="certificate" size="40" />
             </td>
         </tr>
+ -->
+        <tr>
+            <td colspan="2">
+                <textarea rows="15" cols="80" name="certificate">...paste trusted certificate text here...</textarea>
+            </td>
+        </tr>
         <tr>
-            <th align="right">Alias for certificate:</th>
+            <th align="left">Alias for certificate:</th>
             <td>
                 <input type="text" name="alias" size="20" maxlength="200" />
             </td>
         </tr>
     </table>
-    <input type="submit" value="Review Certificate" />
+    <input type="submit" value="Review Certificate" onclick="return <portlet:namespace/>validateForm()"/>
 </form>
 
 

Modified: geronimo/branches/dain/notcm/applications/console/console-standard/src/webapp/WEB-INF/view/keystore/viewKeystore.jsp
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/applications/console/console-standard/src/webapp/WEB-INF/view/keystore/viewKeystore.jsp?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/applications/console/console-standard/src/webapp/WEB-INF/view/keystore/viewKeystore.jsp (original)
+++ geronimo/branches/dain/notcm/applications/console/console-standard/src/webapp/WEB-INF/view/keystore/viewKeystore.jsp Sat Aug  5 18:47:06 2006
@@ -6,20 +6,47 @@
 
 <table width="100%">
   <tr>
+    <td class="DarkBackground">&nbsp;</td>
     <td class="DarkBackground">Alias</td>
     <td class="DarkBackground" align="center">Type</td>
     <td class="DarkBackground" align="center">Certificate Fingerprint</td>
   </tr>
 <c:forEach var="alias" items="${keystore.certificates}">
   <tr>
-    <td>${alias}</td>
+    <td><a href="<portlet:actionURL portletMode="view">
+                 <portlet:param name="mode" value="certificateDetails-before" />
+                 <portlet:param name="id" value="${keystore.instance.keystoreName}" />
+                 <portlet:param name="alias" value="${alias}" /></portlet:actionURL>">
+        view
+        </a>    
+    </td>
+    <td><a href="<portlet:actionURL portletMode="view">
+                 <portlet:param name="mode" value="certificateDetails-before" />
+                 <portlet:param name="id" value="${keystore.instance.keystoreName}" />
+                 <portlet:param name="alias" value="${alias}" /></portlet:actionURL>">
+        ${alias}
+        </a>    
+    </td>
     <td>Trusted Certificate</td>
     <td>${keystore.fingerprints[alias]}</td>
   </tr>
 </c:forEach>
 <c:forEach var="alias" items="${keystore.keys}">
   <tr>
-    <td>${alias}</td>
+    <td><a href="<portlet:actionURL portletMode="view">
+                 <portlet:param name="mode" value="certificateDetails-before" />
+                 <portlet:param name="id" value="${keystore.instance.keystoreName}" />
+                 <portlet:param name="alias" value="${alias}" /></portlet:actionURL>">
+        view
+        </a>    
+    </td>
+    <td><a href="<portlet:actionURL portletMode="view">
+                 <portlet:param name="mode" value="certificateDetails-before" />
+                 <portlet:param name="id" value="${keystore.instance.keystoreName}" />
+                 <portlet:param name="alias" value="${alias}" /></portlet:actionURL>">
+        ${alias}
+        </a>    
+    </td>
     <td>Private Key</td>
     <td>${keystore.fingerprints[alias]}</td>
   </tr>

Modified: geronimo/branches/dain/notcm/applications/console/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/applications/console/pom.xml?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/applications/console/pom.xml (original)
+++ geronimo/branches/dain/notcm/applications/console/pom.xml Sat Aug  5 18:47:06 2006
@@ -17,22 +17,19 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project
-    xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     
     <modelVersion>4.0.0</modelVersion>
     
     <parent>
         <groupId>org.apache.geronimo.applications</groupId>
-        <artifactId>applications-parent</artifactId>
+        <artifactId>applications</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.geronimo.applications.console</groupId>
-    <artifactId>console-parent</artifactId>
+    <artifactId>console</artifactId>
     <packaging>pom</packaging>
     <name>Geronimo Applications :: Console</name>
 

Modified: geronimo/branches/dain/notcm/applications/demo/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/applications/demo/pom.xml?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/applications/demo/pom.xml (original)
+++ geronimo/branches/dain/notcm/applications/demo/pom.xml Sat Aug  5 18:47:06 2006
@@ -17,23 +17,20 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project
-    xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     
     <modelVersion>4.0.0</modelVersion>
     
     <parent>
         <groupId>org.apache.geronimo.applications</groupId>
-        <artifactId>applications-parent</artifactId>
+        <artifactId>applications</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>demo</artifactId>
-    <packaging>war</packaging>
     <name>Geronimo Applications :: Demo</name>
+    <packaging>war</packaging>
     
     <dependencies>
         <!-- Required for JSPC compilation -->

Modified: geronimo/branches/dain/notcm/applications/ldap-realm-demo/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/applications/ldap-realm-demo/pom.xml?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/applications/ldap-realm-demo/pom.xml (original)
+++ geronimo/branches/dain/notcm/applications/ldap-realm-demo/pom.xml Sat Aug  5 18:47:06 2006
@@ -17,27 +17,39 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project
-    xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     
     <modelVersion>4.0.0</modelVersion>
     
     <parent>
         <groupId>org.apache.geronimo.applications</groupId>
-        <artifactId>applications-parent</artifactId>
+        <artifactId>applications</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>geronimo-ldap-demo</artifactId>
-    <packaging>war</packaging>
     <name>Geronimo Applications :: LDAP Demo</name>
+    <packaging>war</packaging>
+    
     <description>
         This is a very simple application that is intended to demonstrate the ldap
         security mechanism.
     </description>
+    
+    <!--
+    
+    HACK: Need to explicitly configure SCM for this module since its artifactId
+          does not match the directory it lives in.
+    
+    FIXME: Rename module directory or artifactId.
+    
+    -->
+    <scm>
+        <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/trunk/applications/ldap-realm-demo</connection>
+        <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/trunk/applications/ldap-realm-demo</developerConnection>
+        <url>http://svn.apache.org/repos/asf/geronimo/trunk/applications/ldap-realm-demo</url>
+    </scm>
     
     <dependencies>
         <!-- Required for JSPC compilation -->

Modified: geronimo/branches/dain/notcm/applications/magicGball/magicGball-client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/applications/magicGball/magicGball-client/pom.xml?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/applications/magicGball/magicGball-client/pom.xml (original)
+++ geronimo/branches/dain/notcm/applications/magicGball/magicGball-client/pom.xml Sat Aug  5 18:47:06 2006
@@ -17,10 +17,7 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project
-    xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     
     <modelVersion>4.0.0</modelVersion>
     
@@ -28,11 +25,10 @@
         <groupId>org.apache.geronimo.applications.magicGball</groupId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
-        <artifactId>magicGball-parent</artifactId>
+        <artifactId>magicGball</artifactId>
     </parent>
 
     <artifactId>magicGball-client</artifactId>
-    <packaging>jar</packaging>
     <name>Geronimo Applications, The Magic G Ball :: Client</name>
 
     <dependencies>

Modified: geronimo/branches/dain/notcm/applications/magicGball/magicGball-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/applications/magicGball/magicGball-ear/pom.xml?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/applications/magicGball/magicGball-ear/pom.xml (original)
+++ geronimo/branches/dain/notcm/applications/magicGball/magicGball-ear/pom.xml Sat Aug  5 18:47:06 2006
@@ -17,10 +17,7 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project
-    xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     
     <modelVersion>4.0.0</modelVersion>
     
@@ -28,13 +25,13 @@
         <groupId>org.apache.geronimo.applications.magicGball</groupId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
-        <artifactId>magicGball-parent</artifactId>
+        <artifactId>magicGball</artifactId>
     </parent>
 
     <artifactId>magicGball-ear</artifactId>
-    <packaging>ear</packaging>
     <name>Geronimo Applications, The Magic G Ball :: EAR</name>
-
+    <packaging>ear</packaging>
+    
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.applications.magicGball</groupId>

Modified: geronimo/branches/dain/notcm/applications/magicGball/magicGball-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/applications/magicGball/magicGball-ejb/pom.xml?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/applications/magicGball/magicGball-ejb/pom.xml (original)
+++ geronimo/branches/dain/notcm/applications/magicGball/magicGball-ejb/pom.xml Sat Aug  5 18:47:06 2006
@@ -17,10 +17,7 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project
-    xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     
     <modelVersion>4.0.0</modelVersion>
     
@@ -28,11 +25,11 @@
         <groupId>org.apache.geronimo.applications.magicGball</groupId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
-        <artifactId>magicGball-parent</artifactId>
+        <artifactId>magicGball</artifactId>
     </parent>
     
     <artifactId>magicGball-ejb</artifactId>
-    <packaging>ejb</packaging>
     <name>Geronimo Applications, The Magic G Ball :: EJB</name>
-
+    <packaging>ejb</packaging>
+    
 </project>

Modified: geronimo/branches/dain/notcm/applications/magicGball/magicGball-web/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/applications/magicGball/magicGball-web/pom.xml?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/applications/magicGball/magicGball-web/pom.xml (original)
+++ geronimo/branches/dain/notcm/applications/magicGball/magicGball-web/pom.xml Sat Aug  5 18:47:06 2006
@@ -17,10 +17,7 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project
-    xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     
     <modelVersion>4.0.0</modelVersion>
     
@@ -28,13 +25,13 @@
         <groupId>org.apache.geronimo.applications.magicGball</groupId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
-        <artifactId>magicGball-parent</artifactId>
+        <artifactId>magicGball</artifactId>
     </parent>
 
     <artifactId>magicGball-web</artifactId>
-    <packaging>war</packaging>
     <name>Geronimo Applications, The Magic G Ball :: WAR</name>
-
+    <packaging>war</packaging>
+    
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.applications.magicGball</groupId>

Propchange: geronimo/branches/dain/notcm/applications/magicGball/maven.xml
------------------------------------------------------------------------------
--- svk:merge (added)
+++ svk:merge Sat Aug  5 18:47:06 2006
@@ -0,0 +1 @@
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/applications/magicGball/maven.xml:424119

Modified: geronimo/branches/dain/notcm/applications/magicGball/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/applications/magicGball/pom.xml?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/applications/magicGball/pom.xml (original)
+++ geronimo/branches/dain/notcm/applications/magicGball/pom.xml Sat Aug  5 18:47:06 2006
@@ -17,24 +17,21 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project
-    xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     
     <modelVersion>4.0.0</modelVersion>
     
     <parent>
         <groupId>org.apache.geronimo.applications</groupId>
-        <artifactId>applications-parent</artifactId>
+        <artifactId>applications</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.geronimo.applications.magicGball</groupId>
-    <artifactId>magicGball-parent</artifactId>
-    <packaging>pom</packaging>
+    <artifactId>magicGball</artifactId>
     <name>Geronimo Applications :: The Magic G Ball</name>
+    <packaging>pom</packaging>
 
     <dependencies>
         <dependency>

Modified: geronimo/branches/dain/notcm/applications/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/applications/pom.xml?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/applications/pom.xml (original)
+++ geronimo/branches/dain/notcm/applications/pom.xml Sat Aug  5 18:47:06 2006
@@ -17,22 +17,19 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project
-    xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     
     <modelVersion>4.0.0</modelVersion>
     
     <parent>
         <groupId>org.apache.geronimo</groupId>
-        <artifactId>geronimo-parent</artifactId>
+        <artifactId>geronimo</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.geronimo.applications</groupId>
-    <artifactId>applications-parent</artifactId>
+    <artifactId>applications</artifactId>
     <name>Geronimo :: Applications</name>
     <packaging>pom</packaging>
     

Propchange: geronimo/branches/dain/notcm/applications/remote-deploy/
------------------------------------------------------------------------------
--- svk:merge (added)
+++ svk:merge Sat Aug  5 18:47:06 2006
@@ -0,0 +1 @@
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/applications/remote-deploy:423550

Modified: geronimo/branches/dain/notcm/applications/remote-deploy/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/applications/remote-deploy/pom.xml?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/applications/remote-deploy/pom.xml (original)
+++ geronimo/branches/dain/notcm/applications/remote-deploy/pom.xml Sat Aug  5 18:47:06 2006
@@ -17,29 +17,41 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project
-    xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     
     <modelVersion>4.0.0</modelVersion>
     
     <parent>
         <groupId>org.apache.geronimo.applications</groupId>
-        <artifactId>applications-parent</artifactId>
+        <artifactId>applications</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>geronimo-remote-deploy</artifactId>
-    <packaging>war</packaging>
     <name>Geronimo Applications :: Remote Deploy</name>
+    <packaging>war</packaging>
+    
     <description>
         This application is essentially a servlet that accepts file upload
         requests from remote clients, which is necessary for remote
         deployment operations to work properly.
     </description>
-
+    
+    <!--
+    
+    HACK: Need to explicitly configure SCM for this module since its artifactId
+          does not match the directory it lives in.
+    
+    FIXME: Rename module directory or artifactId.
+    
+    -->
+    <scm>
+        <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/trunk/applications/remote-deploy</connection>
+        <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/trunk/applications/remote-deploy</developerConnection>
+        <url>http://svn.apache.org/repos/asf/geronimo/trunk/applications/remote-deploy</url>
+    </scm>
+    
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>

Modified: geronimo/branches/dain/notcm/applications/uddi-db/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/applications/uddi-db/pom.xml?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/applications/uddi-db/pom.xml (original)
+++ geronimo/branches/dain/notcm/applications/uddi-db/pom.xml Sat Aug  5 18:47:06 2006
@@ -17,16 +17,13 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project
-    xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     
     <modelVersion>4.0.0</modelVersion>
     
     <parent>
         <groupId>org.apache.geronimo.applications</groupId>
-        <artifactId>applications-parent</artifactId>
+        <artifactId>applications</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -34,80 +31,50 @@
     <artifactId>geronimo-uddi-db</artifactId>
     <name>Geronimo Applications :: UDDI Server Database</name>
     
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-j2ee_1.4_spec</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>juddi</groupId>
-            <artifactId>juddi</artifactId>
-            <version>${juddiVersion}</version>
-            <scope>provided</scope>
-        </dependency>
-        
-        <!-- Required for JSPC compilation -->
-        <dependency>
-            <groupId>tomcat</groupId>
-            <artifactId>jasper-runtime</artifactId>
-        </dependency>
-    </dependencies>
+    <!--
+    
+    HACK: Need to explicitly configure SCM for this module since its artifactId
+          does not match the directory it lives in.
+    
+    FIXME: Rename module directory or artifactId.
+    
+    -->
+    <scm>
+        <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/trunk/applications/uddi-db</connection>
+        <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/trunk/applications/uddi-db</developerConnection>
+        <url>http://svn.apache.org/repos/asf/geronimo/trunk/applications/uddi-db</url>
+    </scm>
+    
+    <properties>
+        <derby.system.home>${project.build.directory}/classes/META-INF/${pom.artifactId}/var/derby</derby.system.home>
+    </properties>
     
     <build>
-        <resources>
-            <resource>
-                <directory>${pom.basedir}/target/resources</directory>
-            </resource>
-        </resources>
-
         <plugins>
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-antrun-plugin</artifactId>
                 <executions>
                     <execution>
+                        <id>prepare-db</id>
                         <phase>generate-resources</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
                         <configuration>
                             <tasks>
-                                <property name="derby.system.home" value="${project.build.directory}/resources/META-INF/${pom.artifactId}/var/derby"/>
-                                <property name="derby.storage.fileSyncTransactionLog" value="true"/>
-                                
                                 <delete dir="${derby.system.home}"/>
                                 <mkdir dir="${derby.system.home}"/>
-                                
-                                <sql driver="org.apache.derby.jdbc.EmbeddedDriver"
-                                    url="jdbc:derby:${derby.system.home}/UddiDatabase;create=true"
-                                    userid=""
-                                    password=""
-                                    autocommit="true"
-                                    onerror="continue"
-                                    delimiter=";">
-                                    
-                                    <fileset dir="${pom.basedir}/src/sql"/>
-                                    
-                                    <!--
-                                    
-                                    NOTE: Due to a rather annonying bug with antrun which does not
-                                          pick up plugin dependencies properly when run from the reactor
-                                          we have to go around the broken dependency system and reference
-                                          the artifact directly.
-                                    
-                                    <classpath refid="maven.plugin.classpath"/>
-                                    -->
-                                    <classpath>
-                                        <fileset dir="${settings.localRepository}/org/apache/derby/derby/${derbyVersion}">
-                                            <include name="derby-${derbyVersion}.jar" />
-                                        </fileset>
-                                    </classpath>
-                                </sql>
                             </tasks>
                         </configuration>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
                     </execution>
                 </executions>
+            </plugin>
+            
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>sql-maven-plugin</artifactId>
+                <version>1.0-beta-1-SNAPSHOT</version>
                 
                 <dependencies>
                     <dependency>
@@ -117,16 +84,26 @@
                         <version>${derbyVersion}</version>
                     </dependency>
                 </dependencies>
-            </plugin>
-            
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>jspc-maven-plugin</artifactId>
-            </plugin>
-            
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>
+                
+                <executions>
+                    <execution>
+                        <id>create-db</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>execute</goal>
+                        </goals>
+                        <configuration>
+                            <driver>org.apache.derby.jdbc.EmbeddedDriver</driver>
+                            <url>jdbc:derby:${derby.system.home}/UddiDatabase;create=true</url>
+                            <autocommit>true</autocommit>
+                            <onError>continue</onError>
+                            <delimiter>;</delimiter>
+                            <srcFiles>
+                                <srcFile>${pom.basedir}/src/sql/juddi.sql</srcFile>
+                            </srcFiles>
+                        </configuration>
+                    </execution>
+                </executions>
             </plugin>
         </plugins>
     </build>

Modified: geronimo/branches/dain/notcm/applications/uddi-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/applications/uddi-server/pom.xml?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/applications/uddi-server/pom.xml (original)
+++ geronimo/branches/dain/notcm/applications/uddi-server/pom.xml Sat Aug  5 18:47:06 2006
@@ -17,25 +17,37 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project
-    xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     
     <modelVersion>4.0.0</modelVersion>
     
     <parent>
         <groupId>org.apache.geronimo.applications</groupId>
-        <artifactId>applications-parent</artifactId>
+        <artifactId>applications</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>geronimo-uddi-server</artifactId>
-    <packaging>war</packaging>
     <name>Geronimo Applications :: UDDI Server</name>
+    <packaging>war</packaging>
+    
+    <!--
+    
+    HACK: Need to explicitly configure SCM for this module since its artifactId
+          does not match the directory it lives in.
+    
+    FIXME: Rename module directory or artifactId.
+    
+    -->
+    <scm>
+        <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/trunk/applications/uddi-server</connection>
+        <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/trunk/applications/uddi-server</developerConnection>
+        <url>http://svn.apache.org/repos/asf/geronimo/trunk/applications/uddi-server</url>
+    </scm>
     
     <dependencies>
+        
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-j2ee_1.4_spec</artifactId>
@@ -45,7 +57,6 @@
         <dependency>
             <groupId>juddi</groupId>
             <artifactId>juddi</artifactId>
-            <version>${juddiVersion}</version>
             <scope>provided</scope>
         </dependency>
         
@@ -54,6 +65,7 @@
             <groupId>tomcat</groupId>
             <artifactId>jasper-runtime</artifactId>
         </dependency>
+        
     </dependencies>
     
     <build>

Propchange: geronimo/branches/dain/notcm/applications/welcome/
------------------------------------------------------------------------------
--- svk:merge (added)
+++ svk:merge Sat Aug  5 18:47:06 2006
@@ -0,0 +1 @@
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/applications/welcome:423294

Modified: geronimo/branches/dain/notcm/applications/welcome/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/applications/welcome/pom.xml?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/applications/welcome/pom.xml (original)
+++ geronimo/branches/dain/notcm/applications/welcome/pom.xml Sat Aug  5 18:47:06 2006
@@ -17,29 +17,41 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project
-    xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     
     <modelVersion>4.0.0</modelVersion>
     
     <parent>
         <groupId>org.apache.geronimo.applications</groupId>
-        <artifactId>applications-parent</artifactId>
+        <artifactId>applications</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>geronimo-welcome</artifactId>
-    <packaging>war</packaging>
     <name>Geronimo Applications :: Welcome</name>
+    <packaging>war</packaging>
+    
     <description>
         This is a very simple application that is intended to serve as the default page
         that can be viewed when the server is first installed so that someone can see
         that the installation is working.
     </description>
-
+    
+    <!--
+    
+    HACK: Need to explicitly configure SCM for this module since its artifactId
+          does not match the directory it lives in.
+    
+    FIXME: Rename module directory or artifactId.
+    
+    -->
+    <scm>
+        <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/trunk/applications/welcome</connection>
+        <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/trunk/applications/welcome</developerConnection>
+        <url>http://svn.apache.org/repos/asf/geronimo/trunk/applications/welcome</url>
+    </scm>
+    
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>

Propchange: geronimo/branches/dain/notcm/applications/welcome/src/
------------------------------------------------------------------------------
--- svk:merge (added)
+++ svk:merge Sat Aug  5 18:47:06 2006
@@ -0,0 +1 @@
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/applications/welcome/src:426500

Modified: geronimo/branches/dain/notcm/applications/welcome/src/webapp/sampleNotInstalled.jsp
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/applications/welcome/src/webapp/sampleNotInstalled.jsp?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/applications/welcome/src/webapp/sampleNotInstalled.jsp (original)
+++ geronimo/branches/dain/notcm/applications/welcome/src/webapp/sampleNotInstalled.jsp Sat Aug  5 18:47:06 2006
@@ -23,7 +23,7 @@
     <link rel="stylesheet" href="/main.css" type="text/css"/>
 </head>
 
-<body>
+<body marginwidth="0" marginheight="0" leftmargin="0" topmargin="0" rightmargin="0">
 
 <!-- Header -->
 <table width="100%">

Propchange: geronimo/branches/dain/notcm/assemblies/
------------------------------------------------------------------------------
--- svk:merge (added)
+++ svk:merge Sat Aug  5 18:47:06 2006
@@ -0,0 +1 @@
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/assemblies:423294

Modified: geronimo/branches/dain/notcm/bootstrap
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/bootstrap?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/bootstrap (original)
+++ geronimo/branches/dain/notcm/bootstrap Sat Aug  5 18:47:06 2006
@@ -3,56 +3,114 @@
 ## $Id$
 ##
 
+PROGNAME=`basename "$0"`
+DIRNAME=`dirname "$0"`
+
+warn() {
+    echo "${PROGNAME}: $*"
+}
+
+die() {
+    warn "$*"
+    exit 1
+}
+
+now() {
+    date +'%H:%M:%S %Z %Y'
+}
+
+begin() {
+    warn "Starting bootstrap build..."
+}
+
+abort() {
+    die "Aborted ($startdate to `now`)"
+}
+
+complete() {
+    if [ "$1" == "0" ]; then
+        warn "Completed ($startdate to `now`)"
+    else
+        die "Failed ($startdate to `now`)"
+    fi
+}
+
 clean() {
     echo "Cleaning..."
     
     rm -rf ~/.m2/repository
     
-    find . -name target -type d -exec rm -rf \{\} \;
+    rm -rf "$DIRNAME/thirdparty"
+    mkdir -p "$DIRNAME/thirdparty"
+    
+    for x in `find "$DIRNAME" -name target -type d`; do
+        rm -rf "$x"
+    done
 }
 
 stage() {
     echo "Starting stage: $1"
     
     mvn -Dstage=$1
+    
+    if [ "$?" != "0" ]; then
+        die "Bootstrap failed in stage $1"
+    fi
 }
 
-thirdparty() {
-    # Build thirdparty components
-    echo "Building thirdparty..."
+specs() {
+    echo "Building Specs..."
     
-    rm -rf thirdparty
-    mkdir -p thirdparty
     (
-        cd thirdparty
+        cd "$DIRNAME/thirdparty"
         
-        # Build TranQL
-        echo "Building TranQL..."
-        
-        svn co https://svn.codehaus.org/tranql/trunk tranql
+        svn co http://svn.apache.org/repos/asf/geronimo/specs/trunk specs
         (
-            cd tranql
-            mvn -Dmaven.test.skip=true install
+            cd specs
+            mvn install
+            
+            if [ "$?" != "0" ]; then
+                die "Bootstrap failed building Specs"
+            fi
         )
+    )
+}
+
+openejb2() {
+    echo "Building OpenEJB2..."
+    
+    (
+        cd "$DIRNAME/thirdparty"
         
-        # Build OpenEJB
-        echo "Building OpenEJB..."
-        
-        svn co https://svn.codehaus.org/openejb/trunk/openejb2 openejb2
+        svn co http://svn.codehaus.org/openejb/trunk/openejb2 openejb2
         (
             cd openejb2
             mvn -Dmaven.test.skip=true install
+            
+            if [ "$?" != "0" ]; then
+                die "Bootstrap failed building OpenEJB"
+            fi
         )
     )
 }
 
-clean
-
-stage bootstrap
-
-thirdparty
-
-stage assemble
+main() {
+    startdate=`now`
+    
+    trap abort STOP KILL INT ABRT
+    
+    if [ "x$1" != "x" ]; then
+        $*
+    else
+        begin && (
+            clean
+			specs && \
+            stage "bootstrap" && \
+            openejb2 && \
+            stage "assemble"
+        ) && complete $?
+    fi
+}
 
-echo "Done"
+main "$@" | 2>&1 tee bootstrap.log
 

Modified: geronimo/branches/dain/notcm/build
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/build?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/build (original)
+++ geronimo/branches/dain/notcm/build Sat Aug  5 18:47:06 2006
@@ -35,16 +35,20 @@
     fi
 }
 
-startdate=`now`
+main() {
+    startdate=`now`
+    
+    trap abort STOP KILL INT ABRT
+    
+    (
+        begin && (
+            mvn -Dstage=bootstrap "$@" && \
+            mvn -Dstage=assemble "$@"
+        ) && complete $?
+    )
+    
+    exit 0
+}
 
-trap abort STOP KILL INT ABRT
-
-(
-    begin && (
-        mvn -Dstage=bootstrap "$@" && \
-        mvn -Dstage=assemble "$@"
-    ) && complete $?
-)
-
-exit 0
+main "$@" | 2>&1 tee build.log
 

Propchange: geronimo/branches/dain/notcm/configs/
------------------------------------------------------------------------------
--- svk:merge (added)
+++ svk:merge Sat Aug  5 18:47:06 2006
@@ -0,0 +1 @@
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/configs:422569

Modified: geronimo/branches/dain/notcm/configs/activemq-broker/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/configs/activemq-broker/pom.xml?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/configs/activemq-broker/pom.xml (original)
+++ geronimo/branches/dain/notcm/configs/activemq-broker/pom.xml Sat Aug  5 18:47:06 2006
@@ -17,12 +17,13 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>configs-parent</artifactId>
+        <artifactId>configs</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Modified: geronimo/branches/dain/notcm/configs/activemq/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/configs/activemq/pom.xml?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/configs/activemq/pom.xml (original)
+++ geronimo/branches/dain/notcm/configs/activemq/pom.xml Sat Aug  5 18:47:06 2006
@@ -17,12 +17,13 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>configs-parent</artifactId>
+        <artifactId>configs</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -62,9 +63,15 @@
         <plugins>
             <plugin>
                 <groupId>org.apache.geronimo.plugins</groupId>
-                <artifactId>geronimo-packaging-plugin</artifactId>
+                <artifactId>car-maven-plugin</artifactId>
                 <configuration>
-                    <deploymentConfig>${j2eeNowebServer}</deploymentConfig>  <!-- no web deployer -->
+                    <deploymentConfigs>
+                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <deploymentConfig>${j2eeDeployer}</deploymentConfig>
+                        <deploymentConfig>${clientDeployer}</deploymentConfig>
+                        <deploymentConfig>${openejbDeployer}</deploymentConfig>
+                        <deploymentConfig>${axisDeployer}</deploymentConfig>
+                    </deploymentConfigs>
                    <moduleFile>${settings.localRepository}/org/apache/geronimo/modules/ge-activemq-rar/${pom.version}/ge-activemq-rar-${pom.version}.rar</moduleFile> 
                 </configuration>
             </plugin>

Modified: geronimo/branches/dain/notcm/configs/axis-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/configs/axis-deployer/pom.xml?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/configs/axis-deployer/pom.xml (original)
+++ geronimo/branches/dain/notcm/configs/axis-deployer/pom.xml Sat Aug  5 18:47:06 2006
@@ -17,12 +17,13 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
     <modelVersion>4.0.0</modelVersion>
     
     <parent>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>configs-parent</artifactId>
+        <artifactId>configs</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Modified: geronimo/branches/dain/notcm/configs/axis/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/configs/axis/pom.xml?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/configs/axis/pom.xml (original)
+++ geronimo/branches/dain/notcm/configs/axis/pom.xml Sat Aug  5 18:47:06 2006
@@ -17,12 +17,13 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
     <modelVersion>4.0.0</modelVersion>
     
     <parent>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>configs-parent</artifactId>
+        <artifactId>configs</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Modified: geronimo/branches/dain/notcm/configs/client-corba/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/configs/client-corba/pom.xml?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/configs/client-corba/pom.xml (original)
+++ geronimo/branches/dain/notcm/configs/client-corba/pom.xml Sat Aug  5 18:47:06 2006
@@ -17,12 +17,13 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
     <modelVersion>4.0.0</modelVersion>
     
     <parent>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>configs-parent</artifactId>
+        <artifactId>configs</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -62,9 +63,14 @@
         <plugins>
             <plugin>
                 <groupId>org.apache.geronimo.plugins</groupId>
-                <artifactId>geronimo-packaging-plugin</artifactId>
+                <artifactId>car-maven-plugin</artifactId>
                 <configuration>
-                    <deploymentConfig>${gbeanDeployer},${j2eeDeployer},${openejbDeployer},${axisDeployer}</deploymentConfig>            
+                    <deploymentConfigs>
+                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <deploymentConfig>${j2eeDeployer}</deploymentConfig>
+                        <deploymentConfig>${openejbDeployer}</deploymentConfig>
+                        <deploymentConfig>${axisDeployer}</deploymentConfig>
+                    </deploymentConfigs>
                  </configuration>
             </plugin>
         </plugins>

Modified: geronimo/branches/dain/notcm/configs/client-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/configs/client-deployer/pom.xml?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/configs/client-deployer/pom.xml (original)
+++ geronimo/branches/dain/notcm/configs/client-deployer/pom.xml Sat Aug  5 18:47:06 2006
@@ -17,12 +17,13 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
     <modelVersion>4.0.0</modelVersion>
     
     <parent>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>configs-parent</artifactId>
+        <artifactId>configs</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Propchange: geronimo/branches/dain/notcm/configs/client-deployer/project.xml
------------------------------------------------------------------------------
--- svk:merge (added)
+++ svk:merge Sat Aug  5 18:47:06 2006
@@ -0,0 +1 @@
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/configs/client-deployer/project.xml:426502

Modified: geronimo/branches/dain/notcm/configs/client-security/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/configs/client-security/pom.xml?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/configs/client-security/pom.xml (original)
+++ geronimo/branches/dain/notcm/configs/client-security/pom.xml Sat Aug  5 18:47:06 2006
@@ -17,12 +17,13 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
     <modelVersion>4.0.0</modelVersion>
     
     <parent>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>configs-parent</artifactId>
+        <artifactId>configs</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -75,9 +76,12 @@
         <plugins>
             <plugin>
                 <groupId>org.apache.geronimo.plugins</groupId>
-                <artifactId>geronimo-packaging-plugin</artifactId>
+                <artifactId>car-maven-plugin</artifactId>
                 <configuration>
-                    <deploymentConfig>${gbeanDeployer},${j2eeDeployer}</deploymentConfig>
+                    <deploymentConfigs>
+                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <deploymentConfig>${j2eeDeployer}</deploymentConfig>
+                    </deploymentConfigs>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/branches/dain/notcm/configs/client-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/configs/client-system/pom.xml?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/configs/client-system/pom.xml (original)
+++ geronimo/branches/dain/notcm/configs/client-system/pom.xml Sat Aug  5 18:47:06 2006
@@ -18,12 +18,13 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
     <modelVersion>4.0.0</modelVersion>
     
     <parent>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>configs-parent</artifactId>
+        <artifactId>configs</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -62,29 +63,28 @@
     
     <build>
         <plugins>
-            <plugin>                
+            <plugin>
                 <groupId>org.apache.geronimo.plugins</groupId>
-                <artifactId>geronimo-packaging-plugin</artifactId>
+                <artifactId>car-maven-plugin</artifactId>
                 <configuration>
-                    <!-- uses default DeploymentConfig=geronimo-gbean-deployer -->
-                    <!-- written to Manifest.mf -->
-                    <classPath>../lib/geronimo-qname_1.1_spec-${geronimoSpecQnameVersion}.jar \
-                        ../lib/geronimo-common-${pom.version}.jar \
-                        ../lib/geronimo-kernel-${pom.version}.jar \
-                        ../lib/geronimo-system-${pom.version}.jar \
-                        ../lib/geronimo-util-${pom.version}.jar \
-                        ../lib/cglib-nodep-${cglibVersion}.jar \
-                        ../lib/commons-cli-${commonsCliVersion}.jar \
-                        ../lib/commons-logging-${commonsLoggingVersion}.jar \
-                        ../lib/log4j-${log4jVersion}.jar \
-                        ../lib/mx4j-${mx4jVersion}.jar \
-                        ../lib/mx4j-remote-${mx4jVersion}.jar \
-                        ../lib/endorsed/xercesImpl-${xercesVersion}.jar \
-                        ../lib/endorsed/xmlParserAPIs-${xmlParserApisVersion}.jar \
-                        ../lib/xpp3-${xpp3Version}.jar \
-                        ../lib/xstream-${xstreamVersion}.jar \</classPath>
-                     <mainClass>org.apache.geronimo.system.main.ClientCommandLine</mainClass>
-                     <!-- default endorsedDirs and extensionDirs -->
+                    <classPath>
+                        <element>../lib/geronimo-qname_1.1_spec-${geronimoSpecQnameVersion}.jar</element>
+                        <element>../lib/geronimo-common-${pom.version}.jar</element>
+                        <element>../lib/geronimo-kernel-${pom.version}.jar</element>
+                        <element>../lib/geronimo-system-${pom.version}.jar</element>
+                        <element>../lib/geronimo-util-${pom.version}.jar</element>
+                        <element>../lib/cglib-nodep-${cglibVersion}.jar</element>
+                        <element>../lib/commons-cli-${commonsCliVersion}.jar</element>
+                        <element>../lib/commons-logging-${commonsLoggingVersion}.jar</element>
+                        <element>../lib/log4j-${log4jVersion}.jar</element>
+                        <element>../lib/mx4j-${mx4jVersion}.jar</element>
+                        <element>../lib/mx4j-remote-${mx4jVersion}.jar</element>
+                        <element>../lib/endorsed/xercesImpl-${xercesVersion}.jar</element>
+                        <element>../lib/endorsed/xmlParserAPIs-${xmlParserApisVersion}.jar</element>
+                        <element>../lib/xpp3-${xpp3Version}.jar</element>
+                        <element>../lib/xstream-${xstreamVersion}.jar</element>
+                    </classPath>
+                    <mainClass>org.apache.geronimo.system.main.ClientCommandLine</mainClass>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/branches/dain/notcm/configs/client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/configs/client/pom.xml?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/configs/client/pom.xml (original)
+++ geronimo/branches/dain/notcm/configs/client/pom.xml Sat Aug  5 18:47:06 2006
@@ -17,12 +17,13 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>configs-parent</artifactId>
+        <artifactId>configs</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Modified: geronimo/branches/dain/notcm/configs/console-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/configs/console-jetty/pom.xml?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/configs/console-jetty/pom.xml (original)
+++ geronimo/branches/dain/notcm/configs/console-jetty/pom.xml Sat Aug  5 18:47:06 2006
@@ -17,12 +17,13 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>configs-parent</artifactId>
+        <artifactId>configs</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -194,13 +195,32 @@
     </dependencies>
     
     <build>
+        <resources>
+            <resource>
+                <directory>${pom.basedir}/src/conf</directory>
+                <targetPath>META-INF</targetPath>
+                <includes>
+                    <include>geronimo-plugin.xml</include>
+                </includes>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+        
         <plugins>
             <plugin>
                 <groupId>org.apache.geronimo.plugins</groupId>
-                <artifactId>geronimo-packaging-plugin</artifactId>
+                <artifactId>car-maven-plugin</artifactId>
                 <configuration>
-                    <deploymentConfig>${j2eeJettyServer}</deploymentConfig>
+                    <deploymentConfigs>
+                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <deploymentConfig>${j2eeDeployer}</deploymentConfig>
+                        <deploymentConfig>${jettyDeployer}</deploymentConfig>
+                        <deploymentConfig>${clientDeployer}</deploymentConfig>
+                        <deploymentConfig>${openejbDeployer}</deploymentConfig>
+                        <deploymentConfig>${axisDeployer}</deploymentConfig>
+                    </deploymentConfigs>
                     <moduleFile>${settings.localRepository}/org/apache/geronimo/applications/console/geronimo-console/${pom.version}/geronimo-console-${pom.version}.ear</moduleFile>
+                    <geronimoPlugin>true</geronimoPlugin>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/branches/dain/notcm/configs/console-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/configs/console-tomcat/pom.xml?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/configs/console-tomcat/pom.xml (original)
+++ geronimo/branches/dain/notcm/configs/console-tomcat/pom.xml Sat Aug  5 18:47:06 2006
@@ -17,12 +17,13 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>configs-parent</artifactId>
+        <artifactId>configs</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -194,13 +195,32 @@
     </dependencies>
     
     <build>
+        <resources>
+            <resource>
+                <directory>${pom.basedir}/src/conf</directory>
+                <targetPath>META-INF</targetPath>
+                <includes>
+                    <include>geronimo-plugin.xml</include>
+                </includes>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+        
         <plugins>
             <plugin>
                 <groupId>org.apache.geronimo.plugins</groupId>
-                <artifactId>geronimo-packaging-plugin</artifactId>
+                <artifactId>car-maven-plugin</artifactId>
                 <configuration>
-                    <deploymentConfig>${j2eeTomcatServer}</deploymentConfig>
+                    <deploymentConfigs>
+                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <deploymentConfig>${j2eeDeployer}</deploymentConfig>
+                        <deploymentConfig>${tomcatDeployer}</deploymentConfig>
+                        <deploymentConfig>${clientDeployer}</deploymentConfig>
+                        <deploymentConfig>${openejbDeployer}</deploymentConfig>
+                        <deploymentConfig>${axisDeployer}</deploymentConfig>
+                    </deploymentConfigs>
                     <moduleFile>${settings.localRepository}/org/apache/geronimo/applications/console/geronimo-console/${pom.version}/geronimo-console-${pom.version}.ear</moduleFile>
+                    <geronimoPlugin>true</geronimoPlugin>
                 </configuration>
             </plugin>
         </plugins>



Mime
View raw message