You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by al...@apache.org on 2013/11/10 02:56:57 UTC
svn commit: r1540432 [3/3] - in /juddi/trunk: ./ juddi-client.net/
juddi-client.net/juddi-client.net-sample/
juddi-client.net/juddi-client.net/bindings/
juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/
juddi-client/src/main/java/org...
Modified: juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/UDDIClerk.cs
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/UDDIClerk.cs?rev=1540432&r1=1540431&r2=1540432&view=diff
==============================================================================
--- juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/UDDIClerk.cs (original)
+++ juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/UDDIClerk.cs Sun Nov 10 01:56:56 2013
@@ -24,7 +24,6 @@ using org.xmlsoap.schemas.easyWsdl;
using System;
using System.Collections.Generic;
using System.Configuration;
-using System.Text;
namespace org.apache.juddi.v3.client.config
{
@@ -91,85 +90,98 @@ namespace org.apache.juddi.v3.client.con
{
this.managerName = managerName;
}
- /*
- public void registerWsdls() {
- if (this.getWsdls() != null) {
- Properties properties = new Properties();
- properties.putAll(this.getUDDINode().getProperties());
-
- for (WSDL wsdl : this.getWsdls()) {
- try {
- URL wsdlUrl = this.getClass().getClassLoader().getResource(wsdl.getFileName());
- ReadWSDL rw = new ReadWSDL();
- Definition wsdlDefinition = rw.readWSDL(wsdlUrl);
- if (wsdl.keyDomain != null) {
- properties.setProperty("keyDomain", wsdl.keyDomain);
+
+ public void registerWsdls()
+ {
+ if (this.getWsdls() != null)
+ {
+ Properties properties = new Properties();
+ properties.putAll(this.getUDDINode().getProperties());
+
+ foreach (WSDL wsdl in this.getWsdls())
+ {
+ try
+ {
+ ReadWSDL rw = new ReadWSDL();
+ tDefinitions wsdlDefinition = rw.readWSDL(wsdl.getFileName());
+ if (wsdl.getKeyDomain() != null)
+ {
+ properties.setProperty("keyDomain", wsdl.getKeyDomain());
+ }
+ if (wsdl.getBusinessKey() != null)
+ {
+ properties.setProperty("businessKey", wsdl.getBusinessKey());
+ }
+
+ WSDL2UDDI wsdl2UDDI = new WSDL2UDDI(this, new URLLocalizer(), properties);
+ wsdl2UDDI.registerBusinessServices(wsdlDefinition);
}
- if (wsdl.businessKey != null) {
- properties.setProperty("businessKey", wsdl.getBusinessKey());
+ catch (Exception e)
+ {
+ log.error("Unable to register wsdl " + wsdl.getFileName() + " ." + e.Message, e);
}
-
- WSDL2UDDI wsdl2UDDI = new WSDL2UDDI(this, new URLLocalizerDefaultImpl(), properties);
- wsdl2UDDI.registerBusinessServices(wsdlDefinition);
- } catch (Exception e) {
- log.error("Unable to register wsdl " + wsdl.getFileName() + " ." + e.Message, e);
- } catch (Throwable t) {
- log.error("Unable to register wsdl " + wsdl.getFileName() + " ." + t.getMessage(), t);
}
}
}
- }
- public void registerWsdls(Definition wsdlDefinition, String keyDomain, String businessKey) {
+ public void registerWsdls(tDefinitions wsdlDefinition, String keyDomain, String businessKey)
+ {
+
+ try
+ {
+ Properties properties = new Properties();
+ properties.putAll(this.getUDDINode().getProperties());
- try {
- Properties properties = new Properties();
- properties.putAll(this.getUDDINode().getProperties());
- //Definition wsdlDefinition = rw.readWSDL(wsdlUrl);
- if (keyDomain != null) {
- properties.setProperty("keyDomain", keyDomain);
- }
- if (businessKey != null) {
- properties.setProperty("businessKey", businessKey);
- }
-
- WSDL2UDDI wsdl2UDDI = new WSDL2UDDI(this, new URLLocalizerDefaultImpl(), properties);
- wsdl2UDDI.registerBusinessServices(wsdlDefinition);
- } catch (Exception e) {
- log.error("Unable to register wsdl " + " ." + e.Message, e);
- } catch (Throwable t) {
- log.error("Unable to register wsdl " + " ." + t.getMessage(), t);
+ if (keyDomain != null)
+ {
+ properties.setProperty("keyDomain", keyDomain);
+ }
+ if (businessKey != null)
+ {
+ properties.setProperty("businessKey", businessKey);
+ }
+ WSDL2UDDI wsdl2UDDI = new WSDL2UDDI(this, new URLLocalizer(), properties);
+ wsdl2UDDI.registerBusinessServices(wsdlDefinition);
+ }
+ catch (Exception e)
+ {
+ log.error("Unable to register wsdl " + " ." + e.Message, e);
+ }
}
- }
- public void unRegisterWsdls() {
- if (this.getWsdls() != null) {
- Properties properties = new Properties();
- properties.putAll(this.getUDDINode().getProperties());
-
- for (WSDL wsdl : this.getWsdls()) {
- try {
- URL wsdlUrl = this.getClass().getClassLoader().getResource(wsdl.getFileName());
- ReadWSDL rw = new ReadWSDL();
- Definition wsdlDefinition = rw.readWSDL(wsdlUrl);
- if (wsdl.keyDomain != null) {
- properties.setProperty("keyDomain", wsdl.keyDomain);
+ public void unRegisterWsdls()
+ {
+ if (this.getWsdls() != null)
+ {
+ Properties properties = new Properties();
+ properties.putAll(this.getUDDINode().getProperties());
+
+ foreach (WSDL wsdl in this.getWsdls())
+ {
+ try
+ {
+ ReadWSDL rw = new ReadWSDL();
+ tDefinitions wsdlDefinition = rw.readWSDL(wsdl.getFileName());
+ if (wsdl.getKeyDomain() != null)
+ {
+ properties.setProperty("keyDomain", wsdl.getKeyDomain());
+ }
+ if (wsdl.getBusinessKey() != null)
+ {
+ properties.setProperty("businessKey", wsdl.getBusinessKey());
+ }
+
+ WSDL2UDDI wsdl2UDDI = new WSDL2UDDI(this, new URLLocalizer(), properties);
+ wsdl2UDDI.unRegisterBusinessServices(wsdlDefinition);
}
- if (wsdl.businessKey != null) {
- properties.setProperty("businessKey", wsdl.getBusinessKey());
+ catch (Exception e)
+ {
+ log.error("Unable to register wsdl " + wsdl.getFileName() + " ." + e.Message, e);
}
-
- WSDL2UDDI wsdl2UDDI = new WSDL2UDDI(this, new URLLocalizerDefaultImpl(), properties);
- wsdl2UDDI.unRegisterBusinessServices(wsdlDefinition);
- } catch (Exception e) {
- log.error("Unable to register wsdl " + wsdl.getFileName() + " ." + e.Message, e);
- } catch (Throwable t) {
- log.error("Unable to register wsdl " + wsdl.getFileName() + " ." + t.getMessage(), t);
}
}
}
- }
- */
+
public org.uddi.apiv3.subscription register(org.uddi.apiv3.subscription subscription)
{
return register(subscription, this.getUDDINode().getApiNode());
@@ -182,7 +194,6 @@ namespace org.apache.juddi.v3.client.con
{
log.info("Registering subscription with key " + subscription.subscriptionKey);
- //Holder<List<Subscription>> holder = new Holder<List<Subscription>>();
try
{
String authToken = getAuthToken(node.securityUrl);
@@ -779,59 +790,38 @@ namespace org.apache.juddi.v3.client.con
return authToken;
}
- public apiv3.node[] savenode(org.apache.juddi.apiv3.node node)
+
+
+ /// <summary>
+ /// This calls a jUDDI implementation specific API call and is used to help
+ /// configure internode communication between jUDDI servers. This is NOT
+ /// part of the UDDI specification.<br> Note: this API call should only
+ /// be used with secure ports (SSL/TLS)
+ /// </summary>
+ /// <param name="senderClerk"></param>
+ /// <returns></returns>
+ public clerk[] saveClerk(UDDIClerk senderClerk)
{
- apiv3.node[] nodeDetail = null;
+
+ clerk[] clerkDetail = null;
try
{
- log.info("Sending node " + node.name + " info to jUDDI " + getUDDINode().getName());
- org.apache.juddi.apiv3.save_noodeInfo savenode = new org.apache.juddi.apiv3.save_noodeInfo();
- savenode.authInfo = (getAuthToken(node.securityUrl));
- savenode.node = new apiv3.node[] { node };
- using (org.apache.juddi.apiv3.JUDDIApiService juddi = getUDDINode().getTransport().getJUDDIApiService(node.juddiApiUrl))
- {
- nodeDetail = juddi.save_Node(savenode);
- }
+ log.debug("Sending Clerk " + senderClerk.getName() + " info to jUDDI " + getUDDINode().getName());
+ save_clerkInfo saveClerk = new save_clerkInfo();
+ saveClerk.authInfo = (getAuthToken(senderClerk.getUDDINode().getSecurityUrl()));
+ saveClerk.clerk = new clerk[] { (getApiClerk()) };
+ clerkDetail = getUDDINode().getTransport().getJUDDIApiService(senderClerk.getUDDINode().getJuddiApiUrl()).save_Clerk(saveClerk);
}
catch (Exception e)
{
- log.error("Unable to save node " + node.name
+ log.error("Unable to save clerk " + getName()
+ " ." + e.Message, e);
}
- return nodeDetail;
+ return clerkDetail;
}
- /* public ClerkDetail saveClerk(UDDIClerk senderClerk)
- {
- ClerkDetail clerkDetail = null;
- try
- {
- log.debug("Sending Clerk " + senderClerk.getName() + " info to jUDDI " + getUDDINode().getName());
- SaveClerk saveClerk = new SaveClerk();
- saveClerk.setAuthInfo(getAuthToken(senderClerk.getUDDINode().getSecurityUrl()));
- saveClerk.getClerk().add(getApiClerk());
- clerkDetail = getUDDINode().getTransport().getJUDDIApiService(senderClerk.getUDDINode().getJuddiApiUrl()).save_Clerk(saveClerk);
- }
- catch (Exception e)
- {
- log.error("Unable to save clerk " + getName()
- + " ." + e.Message, e);
- }
-
- return clerkDetail;
- }
-
- public Clerk getApiClerk()
- {
- Clerk apiClerk = new Clerk();
- apiClerk.setName(name);
- apiClerk.setnode(uddinode.getApiNode());
- apiClerk.setPassword(password);
- apiClerk.setPublisher(publisher);
- return apiClerk;
- }
- */
+
public UDDINode getUDDINode()
{
return uddinode;
@@ -980,19 +970,32 @@ namespace org.apache.juddi.v3.client.con
return tm;
}
- internal void registerWsdls()
- {
- throw new NotImplementedException();
- }
-
- internal void unRegisterWsdls()
+ /// <summary>
+ /// This calls a jUDDI implementation specific API call and is used to help
+ /// configure internode communication between jUDDI servers. This is NOT
+ /// part of the UDDI specification.<br> Note: this API call should only
+ /// be used with secure ports (SSL/TLS)
+ /// </summary>
+ /// <param name="node"></param>
+ /// <returns></returns>
+ public node[] saveNode(apiv3.node node)
{
- throw new NotImplementedException();
- }
+ node[] nodeDetail = null;
+ try
+ {
+ log.info("Sending Node " + node.name + " info to jUDDI " + getUDDINode().getName());
+ save_nodeInfo saveNode = new save_nodeInfo();
+ saveNode.authInfo = (getAuthToken(node.getSecurityUrl()));
+ saveNode.node = new node[] { (node) };
+ nodeDetail = getUDDINode().getTransport().getJUDDIApiService(this.getUDDINode().getJuddiApiUrl()).save_Node(saveNode);
+ }
+ catch (Exception e)
+ {
+ log.error("Unable to save node " + node.name
+ + " ." + e.Message, e);
+ }
- internal void saveNode(apiv3.node node)
- {
- throw new NotImplementedException();
+ return nodeDetail;
}
public void setCryptoProvider(string p)
Modified: juddi/trunk/juddi-client.net/readme.txt
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/readme.txt?rev=1540432&r1=1540431&r2=1540432&view=diff
==============================================================================
--- juddi/trunk/juddi-client.net/readme.txt (original)
+++ juddi/trunk/juddi-client.net/readme.txt Sun Nov 10 01:56:56 2013
@@ -10,4 +10,9 @@ Goals
It is not yet complete!
-Mono users, make sure you use juddi-client.net-mono.sln when building!
\ No newline at end of file
+Mono users, make sure you use juddi-client.net-mono.sln when building!
+
+Notes:
+-embedded mode is not supported
+-transport is via ASP.NET (System.Web.Services)
+-digital signature support is not yet supported
Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerk.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerk.java?rev=1540432&r1=1540431&r2=1540432&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerk.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerk.java Sun Nov 10 01:56:56 2013
@@ -240,12 +240,11 @@ public class UDDIClerk implements Serial
log.info("Registering subscription with key " + subscription.getSubscriptionKey());
Holder<List<Subscription>> holder = new Holder<List<Subscription>>();
try {
- String authToken = getAuthToken(node.getSecurityUrl());
-
List<Subscription> subscriptions = new ArrayList<Subscription>();
subscriptions.add(subscription);
holder.value = subscriptions;
- getUDDINode().getTransport().getUDDISubscriptionService(node.getSubscriptionUrl()).saveSubscription(authToken, holder);
+ getUDDINode().getTransport().getUDDISubscriptionService(node.getSubscriptionUrl()).
+ saveSubscription(getAuthToken(node.getSecurityUrl()), holder);
if (log.isDebugEnabled()) {
log.debug("Registering subscription " + subscription.getSubscriptionKey() + " completed.");
}
@@ -277,9 +276,8 @@ public class UDDIClerk implements Serial
TModelDetail tModelDetail = null;
log.info("Registering tModel with key " + tModel.getTModelKey());
try {
- String authToken = getAuthToken(node.getSecurityUrl());
SaveTModel saveTModel = new SaveTModel();
- saveTModel.setAuthInfo(authToken);
+ saveTModel.setAuthInfo(getAuthToken(node.getSecurityUrl()));
saveTModel.getTModel().add(tModel);
tModelDetail = getUDDINode().getTransport().getUDDIPublishService(node.getPublishUrl()).saveTModel(saveTModel);
if (log.isDebugEnabled()) {
@@ -312,9 +310,8 @@ public class UDDIClerk implements Serial
BindingTemplate bindingTemplate = null;
log.info("Registering bindingTemplate with key " + binding.getBindingKey());
try {
- String authToken2 = getAuthToken(node.getSecurityUrl());
SaveBinding saveBinding = new SaveBinding();
- saveBinding.setAuthInfo(authToken2);
+ saveBinding.setAuthInfo(getAuthToken(node.getSecurityUrl()));
saveBinding.getBindingTemplate().add(binding);
BindingDetail bindingDetail = getUDDINode().getTransport().getUDDIPublishService(node.getPublishUrl()).saveBinding(saveBinding);
bindingTemplate = bindingDetail.getBindingTemplate().get(0);
@@ -349,9 +346,8 @@ public class UDDIClerk implements Serial
log.info("Registering service " + service.getName().get(0).getValue()
+ " with key " + service.getServiceKey());
try {
- String authToken = getAuthToken(node.getSecurityUrl());
SaveService saveService = new SaveService();
- saveService.setAuthInfo(authToken);
+ saveService.setAuthInfo(getAuthToken(node.getSecurityUrl()));
saveService.getBusinessService().add(service);
ServiceDetail serviceDetail = getUDDINode().getTransport().getUDDIPublishService(node.getPublishUrl()).saveService(saveService);
businessService = serviceDetail.getBusinessService().get(0);
@@ -385,9 +381,8 @@ public class UDDIClerk implements Serial
log.info("Registering business " + business.getName().get(0).getValue()
+ " with key " + business.getBusinessKey());
try {
- String authToken = getAuthToken(node.getSecurityUrl());
SaveBusiness saveBusiness = new SaveBusiness();
- saveBusiness.setAuthInfo(authToken);
+ saveBusiness.setAuthInfo(getAuthToken(node.getSecurityUrl()));
saveBusiness.getBusinessEntity().add(business);
BusinessDetail businessDetail = getUDDINode().getTransport().getUDDIPublishService(node.getPublishUrl()).saveBusiness(saveBusiness);
businessEntity = businessDetail.getBusinessEntity().get(0);
@@ -416,9 +411,8 @@ public class UDDIClerk implements Serial
public void unRegisterBusiness(String businessKey, Node node) {
log.info("UnRegistering the business " + businessKey);
try {
- String authToken = getAuthToken(node.getSecurityUrl());
DeleteBusiness deleteBusiness = new DeleteBusiness();
- deleteBusiness.setAuthInfo(authToken);
+ deleteBusiness.setAuthInfo(getAuthToken(node.getSecurityUrl()));
deleteBusiness.getBusinessKey().add(businessKey);
getUDDINode().getTransport().getUDDIPublishService(node.getPublishUrl()).deleteBusiness(deleteBusiness);
} catch (Exception e) {
@@ -439,9 +433,8 @@ public class UDDIClerk implements Serial
public void unRegisterService(String serviceKey, Node node) {
log.info("UnRegistering the service " + serviceKey);
try {
- String authToken = getAuthToken(node.getSecurityUrl());
DeleteService deleteService = new DeleteService();
- deleteService.setAuthInfo(authToken);
+ deleteService.setAuthInfo(getAuthToken(node.getSecurityUrl()));
deleteService.getServiceKey().add(serviceKey);
getUDDINode().getTransport().getUDDIPublishService(node.getPublishUrl()).deleteService(deleteService);
} catch (Exception e) {
@@ -463,9 +456,8 @@ public class UDDIClerk implements Serial
public void unRegisterBinding(String bindingKey, Node node) {
log.info("UnRegistering binding key " + bindingKey);
try {
- String authToken = getAuthToken(node.getSecurityUrl());
DeleteBinding deleteBinding = new DeleteBinding();
- deleteBinding.setAuthInfo(authToken);
+ deleteBinding.setAuthInfo(getAuthToken(node.getSecurityUrl()));
deleteBinding.getBindingKey().add(bindingKey);
getUDDINode().getTransport().getUDDIPublishService(node.getPublishUrl()).deleteBinding(deleteBinding);
} catch (Exception e) {
@@ -762,6 +754,14 @@ public class UDDIClerk implements Serial
return authToken;
}
+ /**
+ * This calls a jUDDI implementation specific API call and is used to help
+ * configure internode communication between jUDDI servers. This is NOT
+ * part of the UDDI specification.<br>
+ * Note: this API call should only be used with secure ports (SSL/TLS)
+ * @param node
+ * @return
+ */
public NodeDetail saveNode(Node node) {
NodeDetail nodeDetail = null;
try {
@@ -780,6 +780,14 @@ public class UDDIClerk implements Serial
return nodeDetail;
}
+ /**
+ * This calls a jUDDI implementation specific API call and is used to help
+ * configure internode communication between jUDDI servers. This is NOT
+ * part of the UDDI specification.<br>
+ * Note: this API call should only be used with secure ports (SSL/TLS)
+ * @param senderClerk
+ * @return
+ */
public ClerkDetail saveClerk(UDDIClerk senderClerk) {
ClerkDetail clerkDetail = null;
try {
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/AuthenticatedService.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/AuthenticatedService.java?rev=1540432&r1=1540431&r2=1540432&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/AuthenticatedService.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/AuthenticatedService.java Sun Nov 10 01:56:56 2013
@@ -151,4 +151,25 @@ public abstract class AuthenticatedServi
}
+ /**
+ * Attempts to get the requestor's ip address from the servlet context, defaults to null it it can't be
+ * retrieved
+ * @return
+ */
+ public String getRequestorsIPAddress()
+ {
+ try {
+ MessageContext mc = ctx.getMessageContext();
+ HttpServletRequest req = null;
+ if (mc != null) {
+ req = (HttpServletRequest) mc.get(MessageContext.SERVLET_REQUEST);
+ }
+ if (req != null) {
+ return req.getRemoteAddr();
+ }
+ } catch (Exception ex) {
+ logger.debug("Error caught looking up the requestor's ip address", ex);
+ }
+ return null;
+ }
}
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDISecurityImpl.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDISecurityImpl.java?rev=1540432&r1=1540431&r2=1540432&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDISecurityImpl.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDISecurityImpl.java Sun Nov 10 01:56:56 2013
@@ -91,13 +91,16 @@ public class UDDISecurityImpl extends Au
modelAuthToken.setLastUsed(new Date());
modelAuthToken.setNumberOfUses(modelAuthToken.getNumberOfUses() + 1);
modelAuthToken.setTokenState(AUTHTOKEN_RETIRED);
+ logger.info("AUDIT: AuthToken discarded for " + modelAuthToken.getAuthorizedName() + " from " + getRequestorsIPAddress());
}
tx.commit();
+
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(SecurityQuery.DISCARD_AUTHTOKEN,
QueryStatus.SUCCESS, procTime);
} catch (DispositionReportFaultMessage drfm) {
+ logger.info("AUDIT: AuthToken discard request aborted, issued from " + getRequestorsIPAddress());
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(SecurityQuery.DISCARD_AUTHTOKEN,
QueryStatus.FAILED, procTime);
@@ -146,17 +149,8 @@ public class UDDISecurityImpl extends Au
modelAuthToken.setAuthorizedName(publisherId);
modelAuthToken.setNumberOfUses(0);
modelAuthToken.setTokenState(AUTHTOKEN_ACTIVE);
- if (ctx !=null){
- try{
- MessageContext mc = ctx.getMessageContext();
- HttpServletRequest req = (HttpServletRequest)mc.get(MessageContext.SERVLET_REQUEST);
- modelAuthToken.setIPAddress(req.getRemoteAddr());
- //System.out.println("Client IP = " + req.getRemoteAddr());
- }
- catch (Exception ex){
- logger.warn("unexpected erorr fetching requestor's ip address. Assiocation of auth token to IP will not be possible", ex);
- }
- }
+ modelAuthToken.setIPAddress(this.getRequestorsIPAddress());
+
em.persist(modelAuthToken);
}
@@ -165,6 +159,7 @@ public class UDDISecurityImpl extends Au
MappingModelToApi.mapAuthToken(modelAuthToken, apiAuthToken);
tx.commit();
+ logger.info("AUDIT: AuthToken issued for " + modelAuthToken.getAuthorizedName() + " from " + getRequestorsIPAddress());
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(SecurityQuery.GET_AUTHTOKEN,
QueryStatus.SUCCESS, procTime);
@@ -174,6 +169,7 @@ public class UDDISecurityImpl extends Au
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(SecurityQuery.GET_AUTHTOKEN,
QueryStatus.FAILED, procTime);
+ logger.info("AUDIT: AuthToken issue FAILED " + publisherId + " from " + getRequestorsIPAddress());
throw drfm;
} finally {
if (tx.isActive()) {
Modified: juddi/trunk/juddi-gui-dsig/pom.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui-dsig/pom.xml?rev=1540432&r1=1540431&r2=1540432&view=diff
==============================================================================
--- juddi/trunk/juddi-gui-dsig/pom.xml (original)
+++ juddi/trunk/juddi-gui-dsig/pom.xml Sun Nov 10 01:56:56 2013
@@ -1,27 +1,27 @@
<?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. * */ -->
+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-dsig</artifactId>
- <name>jUDDI Web Client Digital Signature Applet</name>
+ 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-dsig</artifactId>
+ <name>jUDDI Web Client Digital Signature Applet</name>
- <build>
- <finalName>${artifactId}-${version}</finalName>
- <plugins>
- <plugin>
+ <build>
+ <finalName>${artifactId}-${version}</finalName>
+ <plugins>
+ <plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.4</version>
<configuration>
@@ -39,41 +39,41 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jarsigner-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>sign</goal>
- </goals>
- <phase>package</phase>
- <configuration>
- <archive>${project.build.directory}/${artifactId}-${version}-jar-with-dependencies.jar</archive>
- <keystore>src/main/keystore/signing-jar.keystore</keystore>
- <alias>applet</alias>
- <storepass>applet</storepass>
- <keypass>applet</keypass>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jarsigner-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <archive>${project.build.directory}/${artifactId}-${version}-jar-with-dependencies.jar</archive>
+ <keystore>src/main/keystore/signing-jar.keystore</keystore>
+ <alias>applet</alias>
+ <storepass>applet</storepass>
+ <keypass>applet</keypass>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
- <dependencies>
- <dependency>
- <groupId>org.apache.juddi</groupId>
- <artifactId>juddi-client</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>com.sun.jdk</groupId>
- <artifactId>plugin</artifactId>
- <version>1.6.0</version>
- <type>jar</type>
- <scope>system</scope>
- <systemPath>${java.home}/lib/plugin.jar</systemPath>
- </dependency>
- </dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.juddi</groupId>
+ <artifactId>juddi-client</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.jdk</groupId>
+ <artifactId>plugin</artifactId>
+ <version>1.6.0</version>
+ <type>jar</type>
+ <scope>system</scope>
+ <systemPath>${java.home}/lib/plugin.jar</systemPath>
+ </dependency>
+ </dependencies>
</project>
Modified: juddi/trunk/pom.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/pom.xml?rev=1540432&r1=1540431&r2=1540432&view=diff
==============================================================================
--- juddi/trunk/pom.xml (original)
+++ juddi/trunk/pom.xml Sun Nov 10 01:56:56 2013
@@ -275,7 +275,7 @@
<module>juddi-core-openjpa</module>
<module>juddiv3-war</module>
<module>juddi-examples</module>
- <!-- this may fail on windows -->
+ <!-- this may fail if not on windows -->
<module>juddi-gui-dsig</module>
<module>juddi-gui</module>
<module>juddi-tomcat</module>
Modified: juddi/trunk/uddi-ws/src/main/resources/juddi_api_v1.wsdl
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-ws/src/main/resources/juddi_api_v1.wsdl?rev=1540432&r1=1540431&r2=1540432&view=diff
==============================================================================
--- juddi/trunk/uddi-ws/src/main/resources/juddi_api_v1.wsdl (original)
+++ juddi/trunk/uddi-ws/src/main/resources/juddi_api_v1.wsdl Sun Nov 10 01:56:56 2013
@@ -947,7 +947,7 @@
<xs:element maxOccurs="unbounded" name="publisher" type="tns:publisher"/>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="save_noodeInfo">
+ <xs:complexType name="save_nodeInfo">
<xs:sequence>
<xs:element minOccurs="0" name="authInfo" type="xs:string"/>
<xs:element maxOccurs="unbounded" name="node" type="tns:node"/>
@@ -990,7 +990,7 @@
</xs:complexType>
<xs:element name="delete_ClientSubscriptionInfo" nillable="true" type="tns:delete_clientSubscriptionInfo"/>
<xs:element name="save_Clerk" nillable="true" type="tns:save_clerkInfo"/>
- <xs:element name="save_Node" nillable="true" type="tns:save_noodeInfo"/>
+ <xs:element name="save_Node" nillable="true" type="tns:save_nodeInfo"/>
<xs:element name="adminDelete_tmodel" nillable="true" type="ns2:delete_tModel"/>
<xs:element name="save_ClientSubscriptionInfo" nillable="true" type="tns:save_clientSubscriptionInfo"/>
<xs:element name="invoke_SyncSubscription" nillable="true" type="tns:syncSubscription"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org