You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by ks...@apache.org on 2013/05/21 08:15:44 UTC
svn commit: r1484667 - in /juddi/trunk: ./ juddi-gui/ juddi-gui/nbproject/
juddi-gui/src/conf/ juddi-gui/src/java/ juddi-gui/src/main/
juddi-gui/src/main/java/ juddi-gui/src/main/java/org/apache/juddi/webconsole/
juddi-gui/src/main/java/org/apache/judd...
Author: kstam
Date: Tue May 21 06:15:43 2013
New Revision: 1484667
URL: http://svn.apache.org/r1484667
Log:
JUDDI-613, adding the juddi-gui to the maven build
Added:
juddi/trunk/juddi-gui/pom.xml
juddi/trunk/juddi-gui/src/main/
juddi/trunk/juddi-gui/src/main/java/
- copied from r1484162, juddi/trunk/juddi-gui/src/java/
juddi/trunk/juddi-gui/src/main/resources/
juddi/trunk/juddi-gui/src/main/resources/log4j.properties
juddi/trunk/juddi-gui/src/main/resources/org/
juddi/trunk/juddi-gui/src/main/resources/org/apache/
juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/
juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/
juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/
juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web.properties
juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web_es.properties
- copied unchanged from r1484162, juddi/trunk/juddi-gui/src/java/org/apache/juddi/webconsole/resources/web_es.properties
juddi/trunk/juddi-gui/src/main/webapp/
- copied from r1484162, juddi/trunk/juddi-gui/web/
Removed:
juddi/trunk/juddi-gui/build.xml
juddi/trunk/juddi-gui/nbproject/
juddi/trunk/juddi-gui/src/conf/MANIFEST.MF
juddi/trunk/juddi-gui/src/java/
juddi/trunk/juddi-gui/src/main/java/log4j.properties
juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/resources/web.properties
juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/resources/web_es.properties
juddi/trunk/juddi-gui/src/main/webapp/applets/
juddi/trunk/juddi-gui/web/
Modified:
juddi/trunk/juddi-gui/ (props changed)
juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/AES.java
juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/UddiHub.java
juddi/trunk/juddi-gui/src/main/webapp/WEB-INF/web.xml
juddi/trunk/juddi-gui/src/main/webapp/csrf.jsp
juddi/trunk/juddi-tomcat/build.xml
juddi/trunk/juddi-tomcat/pom.xml
juddi/trunk/pom.xml
Propchange: juddi/trunk/juddi-gui/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue May 21 06:15:43 2013
@@ -1,2 +1,6 @@
build
dist
+.classpath
+.project
+.settings
+target
Added: juddi/trunk/juddi-gui/pom.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/pom.xml?rev=1484667&view=auto
==============================================================================
--- juddi/trunk/juddi-gui/pom.xml (added)
+++ juddi/trunk/juddi-gui/pom.xml Tue May 21 06:15:43 2013
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- * Copyright 2001-2009 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. * */ -->
+<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.juddi</groupId>
+ <artifactId>juddi-parent</artifactId>
+ <version>3.2.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>juddi-gui-war</artifactId>
+ <packaging>war</packaging>
+ <name>jUDDI GUI war construction</name>
+ <url>http://juddi.apache.org</url>
+ <properties>
+ <cxf.version>2.3.1</cxf.version>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.juddi</groupId>
+ <artifactId>juddi-client</artifactId>
+ <version>3.2.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.juddi</groupId>
+ <artifactId>juddi-gui-dsig</artifactId>
+ <version>3.2.0-SNAPSHOT</version>
+ <classifier>jar-with-dependencies</classifier>
+ <scope>provided</scope>
+ </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.6</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-frontend-jaxws</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-http</artifactId>
+ <version>${cxf.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>cglib</groupId>
+ <artifactId>cglib</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib-nodep</artifactId>
+ <version>2.1_3</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <finalName>juddi-gui</finalName>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.1</version>
+ <executions>
+ <execution>
+ <id>copy</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.juddi</groupId>
+ <artifactId>juddi-gui-dsig</artifactId>
+ <classifier>jar-with-dependencies</classifier>
+ <overWrite>true</overWrite>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>${project.build.directory}/juddi-gui/applets</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Modified: juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/AES.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/AES.java?rev=1484667&r1=1484162&r2=1484667&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/AES.java (original)
+++ juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/AES.java Tue May 21 06:15:43 2013
@@ -22,8 +22,10 @@ import java.net.URISyntaxException;
import java.net.URL;
import javax.crypto.*;
import javax.crypto.spec.*;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
/**
* <summary> This program uses a AES key, retrieves its raw bytes, and then
@@ -35,7 +37,7 @@ import org.apache.log4j.Logger;
public class AES {
public static final String logname = "org.apache.juddi.gui";
- public static final Logger log = Logger.getLogger(logname);
+ public static final Log log = LogFactory.getLog(logname);
/**
* Turns array of bytes into string
@@ -96,7 +98,7 @@ public class AES {
byte[] raw = skey.getEncoded();
return asHex(raw);
} catch (Exception ex) {
- log.log(Level.FATAL, "error generating key", ex);
+ log.fatal("error generating key", ex);
}
return null;
}
@@ -121,49 +123,49 @@ public class AES {
if (url == null) {
try {
url = Thread.currentThread().getContextClassLoader().getResource(FileName);
- log.log(Level.DEBUG, "8 file loaded from " + url.toString());
+ log.debug( "8 file loaded from " + url.toString());
} catch (Exception ex) {
- log.log(Level.DEBUG, "not found", ex);
+ log.debug( "not found", ex);
}
}
if (url == null) {
try {
url = Thread.currentThread().getContextClassLoader().getResource("/" + FileName);
- log.log(Level.DEBUG, "7 file loaded from " + url.toString());
+ log.debug( "7 file loaded from " + url.toString());
} catch (Exception ex) {
- log.log(Level.DEBUG, "not found", ex);
+ log.debug( "not found", ex);
}
}
if (url == null) {
try {
url = new URL(FileName);
- log.log(Level.DEBUG, "1 file loaded from " + url.toString());
+ log.debug( "1 file loaded from " + url.toString());
} catch (Exception ex) {
- log.log(Level.DEBUG, "not found", ex);
+ log.debug( "not found", ex);
}
}
if (url == null) {
try {
url = this.getClass().getClassLoader().getResource(FileName);
- log.log(Level.DEBUG, "3 file loaded from " + url.toString());
+ log.debug( "3 file loaded from " + url.toString());
} catch (Exception ex) {
- log.log(Level.DEBUG, "not found", ex);
+ log.debug( "not found", ex);
}
}
if (url == null) {
try {
url = this.getClass().getClassLoader().getResource("/" + FileName);
- log.log(Level.DEBUG, "3 file loaded from " + url.toString());
+ log.debug( "3 file loaded from " + url.toString());
} catch (Exception ex) {
- log.log(Level.DEBUG, "not found", ex);
+ log.debug( "not found", ex);
}
}
try {
return url.toURI();
} catch (URISyntaxException ex) {
- log.log(Level.DEBUG, null, ex);
+ log.debug( null, ex);
}
return null;
}
@@ -203,10 +205,10 @@ public class AES {
} catch (Exception e) {
}
if (key != null) {
- log.log(Level.DEBUG, "key loaded from file");
+ log.debug( "key loaded from file");
return key;
} else {
- log.log(Level.DEBUG, "default encryption key loaded.");
+ log.debug( "default encryption key loaded.");
return something2;
}
}
@@ -257,7 +259,7 @@ public class AES {
}
return false;
} catch (Exception ex) {
- log.log(Level.WARN, null, ex);
+ log.warn( null, ex);
return false;
}
}
@@ -276,7 +278,7 @@ public class AES {
try {
return AES.EN(clear, key);
} catch (Exception ex) {
- Logger.getLogger(logname).log(Level.FATAL, "Cannot encrypt sensitive information! Check to make sure the unlimited strength JCE is installed " + ex.getMessage());
+ log.fatal("Cannot encrypt sensitive information! Check to make sure the unlimited strength JCE is installed " + ex.getMessage());
}
return "";
}
@@ -297,7 +299,7 @@ public class AES {
try {
return AES.DE(cipher, key);
} catch (Exception ex) {
- Logger.getLogger(logname).log(Level.FATAL, "trouble decrypting data, check to make sure the unlimited strength JCE is installed. If this error occured during deployment, I'll automatically try a smaller key size. " + ex.getMessage());
+ log.fatal("trouble decrypting data, check to make sure the unlimited strength JCE is installed. If this error occured during deployment, I'll automatically try a smaller key size. " + ex.getMessage());
}
return cipher;
Modified: juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/UddiHub.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/UddiHub.java?rev=1484667&r1=1484162&r2=1484667&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/UddiHub.java (original)
+++ juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/UddiHub.java Tue May 21 06:15:43 2013
@@ -42,6 +42,8 @@ import javax.xml.datatype.XMLGregorianCa
import javax.xml.ws.BindingProvider;
import javax.xml.ws.Holder;
import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.juddi.v3.client.ClassUtil;
import org.apache.juddi.v3.client.UDDIConstants;
import org.apache.juddi.v3.client.config.UDDIClientContainer;
@@ -51,7 +53,6 @@ import org.apache.juddi.webconsole.PostB
import org.apache.juddi.webconsole.hub.builders.Builders;
import org.apache.juddi.webconsole.hub.builders.Printers;
import org.apache.juddi.webconsole.resources.ResourceLoader;
-import org.apache.log4j.Level;
import org.uddi.api_v3.*;
import org.uddi.custody_v3.DiscardTransferToken;
import org.uddi.custody_v3.TransferEntities;
@@ -88,7 +89,7 @@ public class UddiHub {
* The Log4j logger. This is also referenced from the Builders class, thus
* it is public
*/
- public static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(LOGGER_NAME);
+ public static final Log log = LogFactory.getLog(LOGGER_NAME);
private DatatypeFactory df;
private UddiHub() throws DatatypeConfigurationException {
@@ -1064,15 +1065,15 @@ public class UddiHub {
private String HandleException(Exception ex) {
if (ex instanceof DispositionReportFaultMessage) {
DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
- log.log(Level.ERROR, null, ex);
+ log.error( null, ex);
return ResourceLoader.GetResource(session, "errors.uddi") + " " + ex.getMessage() + " " + f.detail.getMessage();
}
if (ex instanceof RemoteException) {
RemoteException f = (RemoteException) ex;
- log.log(Level.ERROR, null, ex);
+ log.error( null, ex);
return ResourceLoader.GetResource(session, "errors.generic") + " " + ex.getMessage() + " " + f.detail.getMessage();
}
- log.log(Level.ERROR, null, ex);
+ log.error( null, ex);
return //"<div class=\"alert alert-error\" ><h3><i class=\"icon-warning-sign\"></i> "
ResourceLoader.GetResource(session, "errors.generic") + " " + StringEscapeUtils.escapeHtml(ex.getMessage());
//+ "</h3></div>";
Added: juddi/trunk/juddi-gui/src/main/resources/log4j.properties
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/resources/log4j.properties?rev=1484667&view=auto
==============================================================================
--- juddi/trunk/juddi-gui/src/main/resources/log4j.properties (added)
+++ juddi/trunk/juddi-gui/src/main/resources/log4j.properties Tue May 21 06:15:43 2013
@@ -0,0 +1,25 @@
+
+log4j.rootLogger=INFO, logfile
+
+# in case any output is given to stdout, format it
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - %m%n
+
+log4j.appender.logfile=org.apache.log4j.RollingFileAppender
+log4j.appender.logfile.File=${catalina.home}/logs/juddi.log
+log4j.appender.logfile.MaxFileSize=512MB
+# Keep three backup files.
+log4j.appender.logfile.MaxBackupIndex=3
+# Pattern to output: date priority [category] - message
+log4j.appender.logfile.layout=org.apache.log4j.PatternLayout
+log4j.appender.logfile.layout.ConversionPattern=%d %p [%c] - %m%n
+log4j.category.org.apache.juddi=INFO
+#log4j.category.org.springframework.beans.property editors.CustomDateEditor=DEBUG
+
+log4j.debug=false
+
+# showing sql
+#log4j.category.org.hibernate.hql.ast.QueryTranslatorImpl=DEBUG
+#log4j.category.org.hibernate.SQL=DEBUG
+#log4j.category.org.hibernate.loader.hql.QueryLoad er=DEBUG
Added: juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web.properties
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web.properties?rev=1484667&view=auto
==============================================================================
--- juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web.properties (added)
+++ juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web.properties Tue May 21 06:15:43 2013
@@ -0,0 +1,332 @@
+# To change this template, choose Tools | Templates
+# and open the template in the editor.
+
+language=en
+direction=LTR
+title=Apache jUDDI - Open Source UDDI Discovery Services
+description=jUDDI is a free open source implementation of OASIS's UDDI specification. Think of it as a phone book for web services.
+navbar.home=Home
+
+navbar.discover=Discover
+navbar.businesses=Businesses
+
+navbar.businesses.tooltip=Browse for businesses
+navbar.services=Services
+
+navbar.services.tooltip=Browse for Services
+navbar.tmodels=tModels
+
+navbar.tmodels.tooltip=Browse for tModels
+navbar.publishers=Publishers
+
+navbar.publishers.tooltip=Browse for Publishers
+
+navbar.search=Search
+navbar.search.tooltip=Search
+navbar.create=Create
+navbar.create.business=Business
+navbar.create.business.tooltip=Create a Business
+navbar.create.service=Service
+navbar.create.service.tooltip=Create a Service
+navbar.create.tmodel=tModel
+navbar.create.tmodel.tooltip=Create a tModel
+navbar.create.tmodelkeygen.tooltip=Create a tModel Key Generator
+navbar.create.tmodel=tModel
+navbar.create.publisher=Publisher
+navbar.create.publisher.tooltip=Create a Publisher
+navbar.create.tmodelkeygen=tModel Partition (Key Generator)
+
+navbar.subscriptions=Subscriptions
+navbar.subscriptions.view=View Subscriptions
+navbar.subscriptions.create=Create Subscriptions
+navbar.subscriptions.view.tooltip=View My Subscriptions
+navbar.subscriptions.create.tooltip=Create a Subscription
+
+navbar.settings=Settings
+navbar.settings.config=Configure
+navbar.settings.config.tooltip=Configure this UDDI Browser
+
+navbar.help.userguide=User's Guide
+navbar.help.devguide=Developer's Guide
+navbar.help.api=API Documentation
+navbar.help.wiki=jUDDI Wiki
+navbar.help.bugreport=File a Bug Report
+navbar.help.website=Official jUDDI Website
+navbar.help.mailinglist=Mailing List Archive
+
+navbar.login.username=Username
+navbar.login.password=Password
+navbar.login.button=Login
+navbar.login.logout=Click to logout
+
+index.juddi=jUDDI (pronounced "Judy") is an open source Java implementation of the Universal Description, Discovery, and Integration (UDDI v3) specification for (Web) Services. Think of UDDI as the yellow pages of the phone book for web services.
+learnmore=Learn More
+viewdetails=View Details
+index.learn=Learn all about OASIS's UDDI Technical Specification
+index.search=An advanced search capability that allows you search for specific criteria.
+index.browse=Flip through the pages of UDDI. Whether you're just curious or you're looking for something specific and don't know what to search for, the browse feature is a good place to start.
+index.browse.title=Browse
+index.search.title=Search
+index.learn.title=About UDDI
+footer.apachecopyright=© 2013 The Apache Software Foundation. All Rights Reserved.
+modal.digitalsignaturewarning.title=Digital Signature Warning
+modal.digitalsignaturewarning.body=This item is digitally signed. This means that when saving your changes, all existing signatures will become invalid and will automatically be excluded from the save process.
+modal.close=Close
+modal.savechanges=Save Changes
+totals.records=Total records
+totals.recordsreturned=Records Returned
+totals.offset=Offset
+items.lang=Language
+items.loading=Loading
+pages.businesseditor.title=Business Editor
+pages.businesskey=Business Key
+pages.businesskey.description=The Business Key is the unique identifier for this business and exists within this registry.
+pages.editor.tabnav.general=General
+pages.editor.tabnav.discovery=Discovery
+pages.editor.tabnav.contacts=Contacts
+pages.editor.tabnav.categories=Categories
+pages.editor.tabnav.identifiers=Identifiers
+pages.editor.tabnav.services=Services
+pages.editor.tabnav.signatures=Signatures
+pages.editor.tabnav.opinfo=Operational Info
+pages.editor.tabnav.relatedbusinesses=Related Businesses
+items.name=Name
+items.business.name.description=Businesses are identified by one or more name. Multiple names are useful for different languages, legal names, or abbreviations.
+items.value=Value
+items.description=Description
+items.businesses.description=businesses can have more than one description, such as in a different language
+items.discoveryurl=Discovery URLs
+items.discoveryurl.description=are typically a link to a simple web page with additional information on it, such as a listing a services. Two reserved values are specified in the specification, 'homepage' and 'businessEntity'.
+items.type=Type
+items.contacts=Contacts
+items.contacts.description=Each business typically has several points of contact for a person or a job role within the business so that someone who finds the information can make human contact for any purpose. Examples for Type: "technical questions", "technical contact", "establish account", "sales contact".
+items.email=Email
+items.phone=Phone
+items.address=Address
+items.addressline.add=Add an addline (at least one is required).
+items.addressvalue=Address Value
+items.keyname.optional=Key Name (optional)
+items.keyvalue.optional=Key Value (optional)
+items.categories.description=UDDI uses a taxonomy system to categorize businesses and their services. These categories are defined as UDDI tModels and are defined by the administrator(s) of this UDDI node. These categories are appended to business registrations either by adding one or more "Key References" or by adding one or more "Key Reference Groups", which in turn can be a zero or more of Key References as part of it.
+items.keyrefcats=Keyed Reference Categories
+items.keyrefcat.add=Add Key Reference
+items.keyrefgroup=Keyed Reference Groups
+items.keyrefgroup.add=Add Key Reference Group
+items.key=Key
+items.identifiers=Identifiers
+items.identifiers.description=optionally, you can attach identifiers that uniquely identify this item from other systems, such as a tax ID or a <a href="http://www.whitehouse.gov/sites/default/files/omb/grants/duns_num_guide.pdf">DUNS Number</a>.
+items.signed.not=This item is not digitally signed.
+item.signed=This item is digitally signed. Signature Count:
+items.signed.viewcert=View Certificate
+actions.save=Save
+actions.delete=Delete
+actions.sign=Digitally Sign
+actions.transfer=Transfer Ownership
+actions.subscribe=Subscribe
+errors.unknownentity=Error, Unrecongized entity type.
+errors.nodatareturned=No data returned.
+items.business=Business
+error.generic=Error
+errors.tmodel.prefix=A tModel partition key generator must have a name that starts with uddi:
+errors.tmodel.postfix=A tModel partition key generator must have a name that ends with :keyGenerator
+messages.success=Success
+errors.norecordsfound=No records were found.
+#just a prefix
+errors.uddi=UDDI Error
+errors.nocertavaiable=Error, no certificate was available.
+items.nodeid=Node ID
+items.authorizedname=Authorized Name
+items.created=Created
+items.modified=Modified
+items.modifiedwithchildren=Modified include children
+items.signed=This item is digitally signed. Count:
+errors.nobusinessid=No business ID was specified.
+errors.noservicesdefined=No services are defined.
+actions.save.bindingtemplate=Binding Template saved successfully!
+actions.save.service=Service saved successfully!
+errors.noinput.businesskey=Error, no input was provided for the business key.
+items.pubisher.name=Publisher Name
+items.publisher.authname=Authorized Name
+items.publisher.admin=Administrator
+errors.noinput=No input was provided.
+actions.save.tmodel=tModel saved successfully!
+actions.delete.tmodel=tModel deleted successfully.
+actions.delete.business=Business deleted successfully.
+actions.delete.service=Service deleted successfully.
+search.wrylf=What are you looking for?
+items.tmodel=tModel
+items.bindingtemplate=Binding Template
+search.criteria=Search Criteria
+search.criteria.byname=By Name
+search.criteria.bycategory=By Category
+search.criteria.bykey=By Unique Identifier
+search.criteria.bytmodel=By tModel
+search.tip=*Tip: use '%' for any number of wild card characters and '_' for a single wild card character.
+search.results=Search Results
+search.searchfirst=Try searching first
+items.publisher=Publisher
+items.dsigs=Digital Signatures
+items.service.browser=Service Browser
+items.tmodel.browser=tModel Browser
+items.dsigs.description=This page will enable you to digitally sign a UDDI entity using a Java Applet and an X509 Digital Certificate. Windows and MacOS are supported.
+items.settings.description=Administrators can use this page to change the way this UDDI browser is configured, such as endpoint URLs, SSL stores, authentication mechanisms and more.
+pages.tmodelpart.title=tModel Key Generators (Partitions)
+pages.tmodelpart.content=TModel Key Generators are a special kind of tModel that enables you to define new tModels with any arbitrary tModel prefix that you want. For example, if you wanted a tModel defined as "uddi:www.mycompany.com:ServiceAuthenticationMethod", you would first have to create a tModel key generator with the value of "uddi:www.mycompany.com:keyGenerator". This is part of the UDDI specification and acts as a governance mechanism. You can also create a tModel Key Generator by using the Creat tModel menu option and by adding the appropriate settings.
+pages.tmodelpart.juddinote=For jUDDI implementations of UDDI, the "root" account cannot be used to create a keyGenerator.
+pages.tmodelpart.key=The UDDI tModel key
+pages.thmodepart.name=A name describing the key
+pages.viewsubscriptions.content=UDDI offers the ability for users to subscribe for notification to changes in most entities within a UDDI registry. However, the notification part is a bit strange. Users of strict UDDIv3 registries have only one option, periodically poll the UDDI registry for changes via the Subscription API. Although there's data types defined within the UDDI v3 specification, there's no API method for setting up a callback style of subscription, where the registry user hosts a web service that waits for notifications. In a callback subscription, those that need the information are notified immediately.<br><br>jUDDI based registries have an extension to the UDDIv3 specification that enables call back type of communication and is thus preferred mechanism.
+pages.serviceeditor.title=Service Editor
+errors.generic=Error
+pages.businesseditor.businesslist=Business Services
+pages.businesseditor.businesslist2=are defined for this business.
+items.service=Service
+errors.notsignedin=Either an error occured, or you're not signed in.
+pages.viewsubscriptions.listingheader=UDDI Subscriptions
+pages.viewsubscriptions.nosubs=No subscriptions are currently defined.
+errors.juddiapi.without.juddi=You're not connected to a jUDDI registry. Contact the administrator or check the configuration file.
+items.services.name.descriptions=Services are identified by one or more name. Multiple names are useful for different languages, legal names, or abbreviations.
+items.services.description=services can have more than one description, such as in a different language.
+items.bindingtemplate.keyrefgrp=Binding Template Keyed Reference Groups
+items.bindingtemplate.keyrefcat=Binding Template Keyed Reference Categories
+items.overviewurl=Overview Documents
+items.overviewurl.description=These are typically URLs to web pages that describe this tModel's details and usage scenarios.
+items.tmodelinstance.description=tModel Instance Description
+items.tmodelinstance.description2=tModel instance infos can have more than one description, such as in a different language.
+items.tmodelinstance.parameters=tModel Instance Parameters
+items.service.key=Service Key
+items.service.key.description=The Business Key is the unique identifier for the business that this service belongs to. If you specify a service key, it must be prefixed with an existing partition (key generator).
+items.bindingtemplate.description=A service in UDDI really defines a specific type of service, not necessarily an implementation of a service. Binding templates define specifically an implementation of a service and normally includes an access point describing how to use the service. Each service may have 0 or more binding templates. Some registries impose limits on the number of binding templates per service.
+items.bindingtemplate.add=Add a Binding Template
+items.bindingtemplate.key=Binding Template Key
+items.bindingtemplate.description.add=Add a Binding Template Description - binding templates can have more than one description, such as in a different language.
+items.accesspoint=Access Point
+items.accesspoint.description=UDDI allows for a choice of either a Hosting Redirector OR an Access Point. Access Point is recommend. The access point is usually a URL for the service endpoint.
+items.accesspoint.type=Access Point Type
+items.accesspoint.value=Access Point Value
+items.hostingredirector=Hosting Redirector
+items.tmodelinstance.info=tModel Instance Information
+items.tmodelinstance.info.desc=a binding template can have additional information attached to it using the tModel Instance.
+items.overviewurl.add=Add an Overview Document
+items.overviewurl.description.add=Add an Overview Document Description
+items.tmodelinstance.add=Add a tModel Instance
+items.tmodelinstance.description.add=Add a tModel Instance Description
+items.tmodel.key=tModel Key
+items.overviewdocument.description=Overview Document Descriptions
+navbar.help=Help
+pages.tmodeleditor.title=tModel Editor
+pages.editor.tabnav.overview=Overview Documents
+pages.editor.tabnav.overview.description=These are typically URLs to web pages that describe this tModel's details and usage scenarios.
+items.tmodel.description=tModels can have more than one description, such as in a different language.
+items.tmodel.key.description=\ The tModel Key is the unique identifier. If you specify a tModel, it must be prefixed with an existing partition (key generator), other one is generated for you.
+items.tmodel.name=Name - The name describes this tModel. It is a required field.
+items.clicktoedit=Click to edit
+pleasewait=Please wait
+items.description.add=Add a Description
+items.name.add=Add a Name
+items.contact.primary=Primary Contact
+#suggestion
+items.phone.types=(Extension, Domestic, International, DSN)
+items.sortcode=Sort Code
+items.contact.type=Contact Type
+items.contact.default=(Job Title, Role)
+items.addresstype.default=(headquarters. sales office, billing)
+items.welcome=Welcome
+items.expires=Expires
+items.actions=Actions
+actions.asxml=View as XML
+items.name.description=UDDI entities can have more than one name, such as abbreviations or in another language.
+items.signatures.invalid=Signature is invalid! Reason:
+items.signatures.valid=Digital Signature is valid.
+items.unknown=Error, unable to identify which type of object you wanted.
+items.service.add=Add a Service
+items.publisherassertion.add=Add a Business Relationship (Publisher Assertion)
+actions.saved=Saved!
+items.details=Details
+navbar.publisherassertions=Publisher Assertions
+navbar.publisherassertions.tooltip=Allows you to configure relationships between businesses.
+navbar.create.mybiz=My Businesses
+navbar.create.mybiz.tooltip=A list of all businesses that you can alter.
+navbar.create.mybiz.content=My Businesses contains a list of all the UDDI business elements that you have access to. This typically means that you can make changes to it, however this may vary between vendors.
+actions.transfer.description=Transfer this entity to another UDDI node or publisher.
+actions.subscribe.description=Alert me when this entity changes.
+items.publisherassertions.from=This Business
+items.publisherassertions.to=Is related to business
+items.publisherassertions.relationship=Relationship
+items.status=Status
+actions.deleted=Deleted
+navbar.subscriptions.feed=News Feed
+items.picker=Picker
+navbar.subscriptions.feed.tooltip=A new feed based on your subscription settings.
+items.tmodel.chooser=tModel Chooser
+actions.select=Select
+actions.cancel=Cancel
+navbar.transfer=Transfer Custody
+navbar.transfer.tooltip=Transfer Ownership to another Publisher
+items.subscriptions.assertion=Assertion Status Report Changed
+items.subscriptions.bindings=Bindings Changed
+items.subscriptions.business=Businesses Changed
+items.subscriptions.assertion2=Business Relationships (Publisher Assertions)
+items.subscriptions.services=Services Changed
+items.subscriptions.servicelist=Service Listing
+items.subscriptions.tmodels=tModels Changed
+items.subscriptions.tmodels2=tModel Listing
+actions.canceled=Canceled
+actions.success=Success!
+items.transfertoken=Transfer Token
+items.transferkeys=Keys to Transfer (KeyBag)
+error.ohno=Oh no!
+error.occurred=Unfortunately, an error occurred.
+error.pleasereport=Please do us a favor and report to your jUDDI administrator.
+error.timeofevent=Time the event occurred
+error.reportadmin=If you are the administrator, please review the server logs and report the findings to the following URL.
+error.filereport=File a Bug Report
+navbar.help.about=About
+navbar.help.about.tooltip=About this site
+pages.about.content=This website is part of the <a href="http://juddi.apache.org">Apache jUDDI</a> project and provides end user functionality for\n interacting with a UDDI version 3 registry as defined by the OASIS standard located here: <a href="http://uddi.org/pubs/uddi-v3.0.2-20041019.htm">http://uddi.org/pubs/uddi-v3.0.2-20041019.htm</a>.\n <br><br>\n This user interface should work with any UDDI v3 implementation but was designed and tested with the Apache jUDDI server and communicates via \n web service transactions.\n <br><br>\n This user interface is open source and uses a number of other open source libraries and capabilities which are listed below.
+items.binding.chooser=Binding Chooser
+items.service.chooser=Service Chooser
+items.business.chooser=Business Chooser
+items.assertion.chooser=Publisher Assertion Status
+items.subscription.CompletionStatus.STATUS_COMPLETE=This means that there is a visible relationship between two businesses.
+items.subscription.CompletionStatus.STATUS_FROM_KEY_INCOMPLETE=This indicates that a business has has asserted a relationship with one of your businesses, but you have not reciprocated the relationship.
+items.subscription.CompletionStatus.STATUS_TO_KEY_INCOMPLETE=This indicates that the owner of the business has asserted a relationship with another business, but it has not be reciprocated.
+items.subscription.CompletionStatus.STATUS_BOTH_INCOMPLETE=This indicates that the publisher assertion embedded in the assertion Status Item has been deleted from both ends of the business relationship.
+pages.subscription.content=UDDI has a feature that allows you to be alerted of updates to either specific UDDI entries or to search results. This page will help you setup a subscription to meet your needs. Note: only one type of subscription filter can be defined per subscription. Normally, users can make as many subscriptions as they want, however it may be effectively limited by the registry implementation.
+pages.subscription.step1=Step 1 - What do you type of information to you want alerts on?
+pages.subscription.step2=Step 2 - Which items do you want alerts on?
+pages.subscription.step1.specific=Changes to a specific item
+pages.subscription.step1.search=Changes to search results, such as a new item
+items.publisherassertion.status=Publisher Assertion Status
+actions.add=Add
+actions.remove=Remove
+items.findqualifiers=Find Qualifiers
+pages.subscription.step3=Step 3 - How do want to receive the alerts?
+pages.subscription.step3.direct=Send me alerts directly
+pages.subscription.step3.direct.tooltip=Either via a UDDI Subscription Client API, Email or some other notifier
+pages.subscription.step3.pickup=I'll pick them up
+pages.subscription.step3.pickup.tooltip=Either via this website or from your own software that periodically checks for updates
+pages.subscription.step3.content=In order for a UDDI server to notify you of updates asynchronously, you first have to define a business, with a service, with a binding template that tells UDDI where to send the notification (Access Point value). Some UDDI servers (such as Apache jUDDI) require you to also add a tModel Instance defining the transport parameter, such as
+pages.subscription.step4=Step 4 - Options
+items.notificationinterval=Notification Interval (hh:mm:ss)
+items.expiration=Expiration
+items.subscriptionbrief=Brief Subscription
+items.maxrecords.callback=Max records per callback
+navbar.subscriptions.feed.content=The news feed provides you a list of all updated content per your subscription settings
+pages.transfer.content=\ UDDI supports the transfer the ownership of Businesses (and all their child objects including services, binding templates) and tModel entities to another publisher. Publishers represent one or more logins or usernames.<br><Br>Transfers can occur within a UDDI registry node (intra-node) and between multiple registries nodes (inter-node). This utility will help you setup intra-node transfers only. No known UDDI implementations support inter-node transfers (replication API's are not implemented.<br><br>The process is straightforward, select what entities you want to transfer, then click OK. A token will be presented to you which then need to give to the other publisher. The other publisher then needs to accept the token and transfer the ownership to the publisher. Finally, the token is then destroyed to prevent any inadvertent transfers.<br>Transfers can be aborted (token invalidated) before the other publisher transfers the ownership over. Once it's be
en transfered and you want to undo the transfer, contact the registry administrator and the other publisher.
+pages.transfer.createtoken=Create a new Token
+pages.transfer.discardtoken=Discard a transfer token (abort the transfer)
+pages.transfer.accepttransfer=Accept a Transfer
+actions.refresh=Refresh
+pages.transfer.gettoken=Get a Transfer Token
+items.token=Token
+actions.accept=Accept
+pages.transfer.createtoken.content=This tab will help you create a transfer token. Once you have created it, copy the entire contents of the token and give it to the person you're transfering ownership to.
+pages.transfer.discardtoken.content=Made a mistake? No problem. Enter the token below along with the keys to be transfered and it will be removed from the system, preventing any future transfer. It must match exactly. Note: both fields require XML content.
+pages.transfer.accepttransfer.content=If another UDDI publisher gave you a transfer token and you all agreed to transfer ownership of a business or tModel, it can be done here. Enter the transfer token. It must match exactly.
+actions.savethis=Copy and save this information to your computer. There's no way to retrieve this information again!
+navbar.help.source=Source Code
+actions.approve=Approve
+navbar.create.serviceimport=Register Services from WSDL
+navbar.create.serviceimport.tooltip=Based on the UDDI TC, Using WSDL in a UDDI Registry
+warning.ssl=Warning, you're not using SSL and your password could be exposed!
Modified: juddi/trunk/juddi-gui/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/WEB-INF/web.xml?rev=1484667&r1=1484162&r2=1484667&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/WEB-INF/web.xml (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/WEB-INF/web.xml Tue May 21 06:15:43 2013
@@ -18,22 +18,22 @@
<mime-type>application/x-font-woff</mime-type>
</mime-mapping>
<error-page>
- <description>Missing login</description>
+ <!-- <description>Missing login</description> -->
<error-code>401</error-code>
<location>/error.jsp</location>
</error-page>
<error-page>
- <description>Forbidden directory listing</description>
+ <!-- <description>Forbidden directory listing</description> -->
<error-code>403</error-code>
<location>/error.jsp</location>
</error-page>
<error-page>
- <description>Uncaught exception</description>
+ <!-- <description>Uncaught exception</description> -->
<error-code>500</error-code>
<location>/error.jsp</location>
</error-page>
<error-page>
- <description>Unsupported servlet method</description>
+ <!-- <description>Unsupported servlet method</description> -->
<error-code>503</error-code>
<location>/error.jsp</location>
</error-page>
Modified: juddi/trunk/juddi-gui/src/main/webapp/csrf.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/csrf.jsp?rev=1484667&r1=1484162&r2=1484667&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/csrf.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/csrf.jsp Tue May 21 06:15:43 2013
@@ -6,8 +6,6 @@
<%@page import="org.apache.juddi.webconsole.CrossSiteRequestForgeryException"%>
<%@page import="org.apache.juddi.webconsole.hub.UddiHub"%>
-<%@page import="org.apache.log4j.Logger"%>
-<%@page import="org.apache.log4j.Level"%>
<%@page contentType="text/html" pageEncoding="UTF-8"%>
<%
//this is to catch someone that bookmarked a page after selecting a language
@@ -33,14 +31,14 @@
//reject it
session.removeAttribute("nonce");
response.sendRedirect("index.jsp");
- UddiHub.log.log(Level.WARN, "CSRF Test failed, no nonce guid." + request.getRemoteAddr() + request.getRemoteUser());
+ UddiHub.log.warn( "CSRF Test failed, no nonce guid." + request.getRemoteAddr() + request.getRemoteUser());
throw new CrossSiteRequestForgeryException();
} else {
String noncestr = (String) session.getAttribute("nonce");
if (noncestr == null) {
//no session variable to test against, reject it
- UddiHub.log.log(Level.WARN, "CSRF Test failed, no session guid." + request.getRemoteAddr() + request.getRemoteUser());
+ UddiHub.log.warn( "CSRF Test failed, no session guid." + request.getRemoteAddr() + request.getRemoteUser());
session.removeAttribute("nonce");
throw new CrossSiteRequestForgeryException("Cross Site Request Forgery");
}
@@ -55,10 +53,10 @@
// current = UUID.randomUUID();
//session.removeAttribute("nonce");
// session.setAttribute("nonce", current.toString());
- UddiHub.log.log(Level.INFO, "CSRF Test passed.");
+ UddiHub.log.info( "CSRF Test passed.");
} else {
//mismatch, reject it
- UddiHub.log.log(Level.WARN, "CSRF Test failed, session did not match nonce guid." + request.getRemoteAddr() + request.getRemoteUser());
+ UddiHub.log.warn( "CSRF Test failed, session did not match nonce guid." + request.getRemoteAddr() + request.getRemoteUser());
session.removeAttribute("nonce");
throw new CrossSiteRequestForgeryException("Cross Site Request Forgery");
}
Modified: juddi/trunk/juddi-tomcat/build.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-tomcat/build.xml?rev=1484667&r1=1484666&r2=1484667&view=diff
==============================================================================
--- juddi/trunk/juddi-tomcat/build.xml (original)
+++ juddi/trunk/juddi-tomcat/build.xml Tue May 21 06:15:43 2013
@@ -9,6 +9,7 @@
<mkdir dir="${basedir}/target/tomcat"/>
<unzip dest="${basedir}/target/tomcat" src="${dependency.tomcat.zip}"/>
<unzip dest="${webapps.dir}/juddiv3" src="${dependency.juddiv3.war}"/>
+ <unzip dest="${webapps.dir}/juddi-gui" src="${dependency.juddi-gui.war}"/>
</target>
<target name="copy-resources" depends="unzip-tomcat">
Modified: juddi/trunk/juddi-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-tomcat/pom.xml?rev=1484667&r1=1484666&r2=1484667&view=diff
==============================================================================
--- juddi/trunk/juddi-tomcat/pom.xml (original)
+++ juddi/trunk/juddi-tomcat/pom.xml Tue May 21 06:15:43 2013
@@ -44,6 +44,12 @@
<type>war</type>
</dependency>
<dependency>
+ <artifactId>juddi-gui-war</artifactId>
+ <groupId>org.apache.juddi</groupId>
+ <version>${project.parent.version}</version>
+ <type>war</type>
+ </dependency>
+ <dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
<version>10.4.2.0</version>
@@ -100,6 +106,7 @@
<property name="dependency.derby.jar" value="${maven.dependency.org.apache.derby.derby.jar.path}" />
<property name="dependency.tomcat.zip" value="${maven.dependency.org.apache.juddi.bootstrap.apache-tomcat.zip.path}" />
<property name="dependency.juddiv3.war" value="${basedir}/../juddiv3-war/target/juddiv3.war" />
+ <property name="dependency.juddi-gui.war" value="${basedir}/../juddi-gui/target/juddi-gui.war" />
<property name="dependency.jaxws.jar" value="${maven.dependency.org.apache.geronimo.specs.geronimo-jaxws_2.2_spec.jar.path}" />
<ant antfile="${basedir}/build.xml">
<property name="dependency.tomcat.zip" value="${dependency.tomcat.zip}" />
Modified: juddi/trunk/pom.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/pom.xml?rev=1484667&r1=1484666&r2=1484667&view=diff
==============================================================================
--- juddi/trunk/pom.xml (original)
+++ juddi/trunk/pom.xml Tue May 21 06:15:43 2013
@@ -267,6 +267,7 @@
<module>juddiv3-war</module>
<module>juddi-examples</module>
<module>juddi-gui-dsig</module>
+ <module>juddi-gui</module>
<module>juddi-tomcat</module>
<module>uddi-tck</module>
</modules>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org