You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by tc...@apache.org on 2009/07/16 05:56:51 UTC
svn commit: r794514 - in /webservices/juddi/branches/v3_trunk/juddi-war: ./
src/main/java/ src/main/java/org/ src/main/java/org/apache/
src/main/java/org/apache/juddi/ src/main/webapp/
src/main/webapp/WEB-INF/classes/ src/main/webapp/WEB-INF/classes/ME...
Author: tcunning
Date: Thu Jul 16 03:56:50 2009
New Revision: 794514
URL: http://svn.apache.org/viewvc?rev=794514&view=rev
Log:
JUDDI-188
Commit base WAR changes.
Added:
webservices/juddi/branches/v3_trunk/juddi-war/src/main/java/
webservices/juddi/branches/v3_trunk/juddi-war/src/main/java/org/
webservices/juddi/branches/v3_trunk/juddi-war/src/main/java/org/apache/
webservices/juddi/branches/v3_trunk/juddi-war/src/main/java/org/apache/juddi/
webservices/juddi/branches/v3_trunk/juddi-war/src/main/java/org/apache/juddi/RegistryServlet.java
webservices/juddi/branches/v3_trunk/juddi-war/src/main/webapp/WEB-INF/classes/
webservices/juddi/branches/v3_trunk/juddi-war/src/main/webapp/WEB-INF/classes/META-INF/
webservices/juddi/branches/v3_trunk/juddi-war/src/main/webapp/WEB-INF/classes/META-INF/persistence.xml
webservices/juddi/branches/v3_trunk/juddi-war/src/main/webapp/index.jsp
webservices/juddi/branches/v3_trunk/juddi-war/src/main/webapp/juddi.css
Removed:
webservices/juddi/branches/v3_trunk/juddi-war/index.jsp
webservices/juddi/branches/v3_trunk/juddi-war/juddi.css
Modified:
webservices/juddi/branches/v3_trunk/juddi-war/pom.xml
Modified: webservices/juddi/branches/v3_trunk/juddi-war/pom.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-war/pom.xml?rev=794514&r1=794513&r2=794514&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-war/pom.xml (original)
+++ webservices/juddi/branches/v3_trunk/juddi-war/pom.xml Thu Jul 16 03:56:50 2009
@@ -29,23 +29,149 @@
<version>3.0.0.SNAPSHOT</version>
<name>jUDDI Axis2 Deployment</name>
<url>http://maven.apache.org</url>
+ <properties>
+ <cxf.version>2.1.3</cxf.version>
+ </properties>
<dependencies>
<dependency>
+ <artifactId>uddi-ws</artifactId>
+ <groupId>org.apache.juddi</groupId>
+ <version>3.0.0.SNAPSHOT</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>jaxws-rt</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
<artifactId>juddi-core</artifactId>
<groupId>org.apache.juddi</groupId>
<version>3.0.0.SNAPSHOT</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.juddi</groupId>
+ <artifactId>uddi-ws</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.juddi</groupId>
+ <artifactId>uddi-tck</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.persistence</groupId>
+ <artifactId>persistence-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-entitymanager</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>cglib</groupId>
+ <artifactId>cglib-nodep</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ <version>1.5</version>
<exclusions>
<exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
</exclusion>
</exclusions>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
- </dependency>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.13</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-frontend-jaxws</artifactId>
+ <version>${cxf.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-http</artifactId>
+ <version>${cxf.version}</version>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>cglib</groupId>
+ <artifactId>cglib</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib-nodep</artifactId>
+ <version>2.1_3</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
<finalName>juddi</finalName>
Added: webservices/juddi/branches/v3_trunk/juddi-war/src/main/java/org/apache/juddi/RegistryServlet.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-war/src/main/java/org/apache/juddi/RegistryServlet.java?rev=794514&view=auto
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-war/src/main/java/org/apache/juddi/RegistryServlet.java (added)
+++ webservices/juddi/branches/v3_trunk/juddi-war/src/main/java/org/apache/juddi/RegistryServlet.java Thu Jul 16 03:56:50 2009
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.juddi;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+
+import org.apache.commons.configuration.ConfigurationException;
+import org.apache.log4j.Logger;
+
+/**
+ * This servlet is ONLY used to initialize the jUDDI webapp on startup and
+ * cleanup the jUDDI webapp on shutdown.
+ *
+ * @author Steve Viens (sviens@apache.org)
+ */
+public class RegistryServlet extends HttpServlet {
+ private static final long serialVersionUID = 1L;
+ private static Logger logger = Logger.getLogger(RegistryServlet.class);
+
+ /**
+ * Create the shared instance of jUDDI's Registry class and call it's
+ * "init()" method to initialize all core components.
+ */
+ @Override
+ public void init(ServletConfig config) throws ServletException {
+ super.init(config);
+ try {
+ Registry.start();
+ } catch (ConfigurationException e) {
+ logger.error("jUDDI registry could not be started."
+ + e.getMessage(), e);
+ }
+ }
+
+ @Override
+ public void destroy() {
+ try {
+ Registry.stop();
+ } catch (ConfigurationException e) {
+ logger.error("jUDDI registry could not be stopped."
+ + e.getMessage(), e);
+ }
+ super.destroy();
+ }
+
+}
\ No newline at end of file
Added: webservices/juddi/branches/v3_trunk/juddi-war/src/main/webapp/WEB-INF/classes/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-war/src/main/webapp/WEB-INF/classes/META-INF/persistence.xml?rev=794514&view=auto
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-war/src/main/webapp/WEB-INF/classes/META-INF/persistence.xml (added)
+++ webservices/juddi/branches/v3_trunk/juddi-war/src/main/webapp/WEB-INF/classes/META-INF/persistence.xml Thu Jul 16 03:56:50 2009
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence xmlns="http://java.sun.com/xml/ns/persistence"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"
+ version="1.0">
+ <persistence-unit name="juddiDatabase" transaction-type="RESOURCE_LOCAL">
+ <provider>org.hibernate.ejb.HibernatePersistence</provider>
+ <jta-data-source>java:/JuddiDS</jta-data-source>
+
+ <!-- When not using Hibernate autodetection, persistent classes must be listed here -->
+ <class>org.apache.juddi.model.AuthToken</class>
+ <class>org.apache.juddi.model.Address</class>
+ <class>org.apache.juddi.model.AddressLine</class>
+ <class>org.apache.juddi.model.AuthToken</class>
+ <class>org.apache.juddi.model.BindingCategoryBag</class>
+ <class>org.apache.juddi.model.BindingDescr</class>
+ <class>org.apache.juddi.model.BindingTemplate</class>
+ <class>org.apache.juddi.model.BusinessCategoryBag</class>
+ <class>org.apache.juddi.model.BusinessDescr</class>
+ <class>org.apache.juddi.model.BusinessEntity</class>
+ <class>org.apache.juddi.model.BusinessIdentifier</class>
+ <class>org.apache.juddi.model.BusinessName</class>
+ <class>org.apache.juddi.model.BusinessService</class>
+ <class>org.apache.juddi.model.CategoryBag</class>
+ <class>org.apache.juddi.model.Contact</class>
+ <class>org.apache.juddi.model.ContactDescr</class>
+ <class>org.apache.juddi.model.DiscoveryUrl</class>
+ <class>org.apache.juddi.model.Email</class>
+ <class>org.apache.juddi.model.InstanceDetailsDescr</class>
+ <class>org.apache.juddi.model.InstanceDetailsDocDescr</class>
+ <class>org.apache.juddi.model.KeyedReference</class>
+ <class>org.apache.juddi.model.KeyedReferenceGroup</class>
+ <class>org.apache.juddi.model.OverviewDoc</class>
+ <class>org.apache.juddi.model.OverviewDocDescr</class>
+ <class>org.apache.juddi.model.PersonName</class>
+ <class>org.apache.juddi.model.Phone</class>
+ <class>org.apache.juddi.model.Publisher</class>
+ <class>org.apache.juddi.model.PublisherAssertion</class>
+ <class>org.apache.juddi.model.PublisherAssertionId</class>
+ <class>org.apache.juddi.model.ServiceCategoryBag</class>
+ <class>org.apache.juddi.model.ServiceDescr</class>
+ <class>org.apache.juddi.model.ServiceName</class>
+ <class>org.apache.juddi.model.ServiceProjection</class>
+ <class>org.apache.juddi.model.Subscription</class>
+ <class>org.apache.juddi.model.SubscriptionChunkToken</class>
+ <class>org.apache.juddi.model.SubscriptionMatch</class>
+ <class>org.apache.juddi.model.Tmodel</class>
+ <class>org.apache.juddi.model.TmodelCategoryBag</class>
+ <class>org.apache.juddi.model.TmodelDescr</class>
+ <class>org.apache.juddi.model.TmodelIdentifier</class>
+ <class>org.apache.juddi.model.TmodelInstanceInfo</class>
+ <class>org.apache.juddi.model.TmodelInstanceInfoDescr</class>
+ <class>org.apache.juddi.model.TransferToken</class>
+ <class>org.apache.juddi.model.TransferTokenKey</class>
+ <class>org.apache.juddi.model.UddiEntity</class>
+ <class>org.apache.juddi.model.UddiEntityPublisher</class>
+
+ <properties>
+ <property name="hibernate.hbm2ddl.auto" value="update"/>
+ <property name="hibernate.show_sql" value="false"/>
+
+ <!-- derby connection properties -->
+ <property name="hibernate.dialect" value="org.hibernate.dialect.DerbyDialect"/>
+ </properties>
+ </persistence-unit>
+</persistence>
Added: webservices/juddi/branches/v3_trunk/juddi-war/src/main/webapp/index.jsp
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-war/src/main/webapp/index.jsp?rev=794514&view=auto
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-war/src/main/webapp/index.jsp (added)
+++ webservices/juddi/branches/v3_trunk/juddi-war/src/main/webapp/index.jsp Thu Jul 16 03:56:50 2009
@@ -0,0 +1,92 @@
+<%@ page session="false" %>
+<%@ page import="java.util.List,
+ org.apache.juddi.config.Install,
+ javax.xml.bind.JAXBException,
+ org.uddi.v3_service.DispositionReportFaultMessage,
+ org.apache.juddi.config.AppConfig,
+ org.apache.juddi.config.Property,
+ org.uddi.api_v3.BusinessEntity,
+ org.uddi.api_v3.Name,
+ org.uddi.api_v3.Description,
+ java.io.IOException,
+ org.apache.juddi.config.Release"
+%>
+
+<!-- index.jsp -->
+<html>
+<head>
+<title>Apache jUDDI Registry</title>
+<link rel="stylesheet" href="juddi.css" />
+</head>
+<body>
+<div class="header" align="right"><a href="http://ws.apache.org/juddi/" target="_top">jUDDI@Apache</a></div>
+<h1>Apache jUDDI version <%= Release.getRegistryVersion() %></h1>
+
+
+<h3><em>Welcome</em> to Apache jUDDI!</h3>
+<ul>
+ <li><a href="/pluto/portal/jUDDI">jUDDI Portal</a></li>
+ <li><a href="services">View</a> service listing</li>
+ <li><a href="http://ws.apache.org/juddi/">Visit</a> the Apache-jUDDI Home Page</li>
+</ul>
+
+<div class="install">
+ <h4>jUDDI Installation</h4>
+ <div class="content">
+<%
+ // This will tirgger the install process...
+ String rootPartition = AppConfig.getConfiguration().getString(Property.JUDDI_ROOT_PARTITION);
+ String nodeId = AppConfig.getConfiguration().getString(Property.JUDDI_NODE_ID);
+ String nodeName = "";
+ String nodeDescription = "";
+
+ BusinessEntity be = Install.getNodeBusinessEntity(nodeId);
+
+ if (be != null) {
+ Name n = (Name) be.getName().get(0);
+ if (n != null)
+ nodeName = n.getValue();
+
+ List descList = be.getDescription();
+ if (descList != null && descList.size() > 0) {
+ Description d = (Description) descList.get(0);
+ if (d != null)
+ nodeDescription = d.getValue();
+ }
+ }
+%>
+ <div>jUDDI has been successfully installed!</div>
+ <p />
+ <h3>Node Information</h3>
+ <table>
+ <tr>
+ <td><b>Root Partition:</b></td>
+ <td><%= rootPartition %></td>
+ </tr>
+ <tr>
+ <td><b>Node Id:</b></td>
+ <td><%= nodeId %></td>
+ </tr>
+ <tr>
+ <td><b>Name:</b></td>
+ <td><%= nodeName %></td>
+ </tr>
+ <tr>
+ <td><b>Description:</b></td>
+ <td><%= nodeDescription %></td>
+ </tr>
+ </table>
+ </div>
+</div>
+
+<hr />
+<table width="100%" border="0">
+ <tr>
+ <td height="50" align="center" valign="bottom" nowrap>
+ <div class="footer"> </div>
+ </td>
+ </tr>
+</table>
+
+</body>
+</html>
Added: webservices/juddi/branches/v3_trunk/juddi-war/src/main/webapp/juddi.css
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-war/src/main/webapp/juddi.css?rev=794514&view=auto
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-war/src/main/webapp/juddi.css (added)
+++ webservices/juddi/branches/v3_trunk/juddi-war/src/main/webapp/juddi.css Thu Jul 16 03:56:50 2009
@@ -0,0 +1,157 @@
+body {
+ margin: 0px 10px 10px 10px;
+ font-family: "Trebuchet MS", sans-serif;
+ font-size: 10pt;
+ background: #FFF;
+ color: #000;
+}
+
+h1 {
+ font-family: "Trebuchet MS", sans-serif;
+ background: #00005A;
+ font-weight: normal;
+ color: White;
+ padding: 5px 10px;
+ margin: 0px -10px 10px -10px;
+}
+
+h2 {
+ font-family: "Trebuchet MS", sans-serif;
+ color: #00005A;
+}
+
+h3 {
+ font-family: "Trebuchet MS", sans-serif;
+ color: #00005A;
+}
+
+h4 {
+ font-family: "Trebuchet MS", sans-serif;
+ color: #00005A;
+}
+
+.sidebar {
+ border: 1px solid #00005A;
+ background: #EEE;
+ padding: 5px;
+}
+
+pre.code_sample {
+ background: #EEE;
+ padding: 5px;
+}
+
+dt {
+ font-weight: bold;
+}
+
+dl {
+ margin-left: 3em;
+}
+
+td {
+ font-size: 10pt;
+}
+
+DIV.announcement dl {
+ margin-left: 0px;
+}
+
+div.LINK {
+ margin: 0px -10px;
+ padding: 2px 10px;
+ color: #000;
+ font-size: 10pt;
+}
+
+div.LINK A {
+ color: #6d0000;
+ text-decoration: none;
+}
+
+div.LINK A:hover {
+ color: #006200;
+ text-decoration: underline;
+}
+
+div.NAV {
+ background: #000;
+ margin: 0px -10px;
+ padding: 2px 10px;
+ color: #CCC;
+ font-size: 12pt;
+ font-weight: bold;
+}
+
+div.NAV A {
+ color: #CCC;
+ text-decoration: none;
+}
+
+div.NAV A:hover {
+ color: #FFF;
+}
+
+.msgs {
+ background-color: #FFD;
+ color: #005500;
+}
+
+.ednote {
+ color: #999;
+ font-style: italic;
+}
+
+.cvs_id {
+ color: #999;
+ font-size: 8pt;
+ border-top: solid 1px #999;
+}
+
+.author {
+ font-size: 14pt;
+ font-style: italic;
+}
+
+var {
+ font-style: italic;
+ color: #900;
+}
+
+div.footer {
+ color: #666699; margin: 0px -10px; padding: 2px 10px; font-size: 8pt; font-weight: normal;
+}
+
+div.footer a {
+ color: #666699; text-decoration: none;
+}
+
+div.footer a:hover {
+ color: #666699; text-decoration: underline;
+}
+
+div.header {
+ background: #000;
+ margin: 0px -10px;
+ padding: 2px 10px;
+ color: #CCC;
+ font-size: 8pt;
+ font-weight: bold;
+}
+
+div.header a {
+ color: #CCC;
+ text-decoration: none;
+}
+
+div.header a:hover {
+ color: #FFF;
+}
+
+div.error {
+ color: #F00;
+}
+
+div.install {width:650px; background-color: #00005a;}
+div.install h4 {margin:0; padding:0; color: #fff;}
+div.install .content {margin:0; padding:4px 4px 0 4px; border-style:solid; border-color:#bbb; border-width:0 1px 1px 1px; background-color: #fff;}
---------------------------------------------------------------------
To unsubscribe, e-mail: juddi-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: juddi-cvs-help@ws.apache.org