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 20:33:46 UTC
svn commit: r1540526 [3/3] - in /juddi/trunk:
juddi-client.net/juddi-client.net-sample/
juddi-client.net/juddi-client.net-sample/juddi/
juddi-client.net/juddi-client.net/
juddi-client.net/juddi-client.net/bindings/
juddi-client.net/juddi-client.net/org...
Modified: juddi/trunk/juddi-client.net/juddi-client.net/juddi-client.net.csproj
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net/juddi-client.net.csproj?rev=1540526&r1=1540525&r2=1540526&view=diff
==============================================================================
--- juddi/trunk/juddi-client.net/juddi-client.net/juddi-client.net.csproj (original)
+++ juddi/trunk/juddi-client.net/juddi-client.net/juddi-client.net.csproj Sun Nov 10 19:33:45 2013
@@ -46,6 +46,7 @@
<Compile Include="bindings\events.cs" />
<Compile Include="bindings\ext.cs" />
<Compile Include="bindings\JUDDIApiService.cs" />
+ <Compile Include="org.apache.juddi.jaxb\PrintJUDDI.cs" />
<Compile Include="org.apache.juddi.jaxb\PrintUDDI.cs" />
<Compile Include="org.apache.juddi.v3.client.annotations\AnnotationProcessor.cs" />
<Compile Include="org.apache.juddi.v3.client.annotations\UDDIService.cs" />
Modified: juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.jaxb/PrintUDDI.cs
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.jaxb/PrintUDDI.cs?rev=1540526&r1=1540525&r2=1540526&view=diff
==============================================================================
--- juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.jaxb/PrintUDDI.cs (original)
+++ juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.jaxb/PrintUDDI.cs Sun Nov 10 19:33:45 2013
@@ -22,6 +22,11 @@ using System.Xml.Serialization;
namespace org.apache.juddi.jaxb
{
+ /// <summary>
+ /// This is for printing UDDI v3 spec data objects only
+ /// @author <a href="mailto:alexoree@apache.org">Alex O'Ree</a>
+ /// </summary>
+ /// <typeparam name="T"></typeparam>
public class PrintUDDI<T>
{
public String print(Object j)
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=1540526&r1=1540525&r2=1540526&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 19:33:45 2013
@@ -985,7 +985,7 @@ namespace org.apache.juddi.v3.client.con
{
log.info("Sending Node " + node.name + " info to jUDDI " + getUDDINode().getName());
save_nodeInfo saveNode = new save_nodeInfo();
- saveNode.authInfo = (getAuthToken(node.getSecurityUrl()));
+ saveNode.authInfo = (getAuthToken(this.getUDDINode().getSecurityUrl()));
saveNode.node = new node[] { (node) };
nodeDetail = getUDDINode().getTransport().getJUDDIApiService(this.getUDDINode().getJuddiApiUrl()).save_Node(saveNode);
}
Added: juddi/trunk/juddi-examples/more-uddi-samples/src/main/resources/META-INF/simple-publish-uddi.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/more-uddi-samples/src/main/resources/META-INF/simple-publish-uddi.xml?rev=1540526&view=auto
==============================================================================
--- juddi/trunk/juddi-examples/more-uddi-samples/src/main/resources/META-INF/simple-publish-uddi.xml (added)
+++ juddi/trunk/juddi-examples/more-uddi-samples/src/main/resources/META-INF/simple-publish-uddi.xml Sun Nov 10 19:33:45 2013
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+
+<uddi xmlns="urn:juddi-apache-org:v3_client" xsi:schemaLocation="classpath:/xsd/uddi-client.xsd">
+ <reloadDelay>5000</reloadDelay>
+ <client name="example-client">
+ <nodes>
+ <node>
+ <!-- required 'default' node -->
+ <name>default</name>
+ <properties>
+ <property name="serverName" value="localhost"/>
+ <property name="serverPort" value="8080"/>
+ <!-- for UDDI nodes that use HTTP u/p, using the following
+ <property name="basicAuthUsername" value="root" />
+ <property name="basicAuthPassword" value="password" />
+ <property name="basicAuthPasswordIsEncrypted" value="false" />
+ <property name="basicAuthPasswordCryptoProvider" value="org.apache.juddi.v3.client.crypto.AES128Cryptor (an example)" />-->
+ </properties>
+ <description>Main jUDDI node</description>
+ <!-- JAX-WS Transport -->
+ <proxyTransport>org.apache.juddi.v3.client.transport.JAXWSTransport</proxyTransport>
+ <custodyTransferUrl>http://${serverName}:${serverPort}/juddiv3/services/custody-transfer</custodyTransferUrl>
+ <inquiryUrl>http://${serverName}:${serverPort}/juddiv3/services/inquiry</inquiryUrl>
+ <publishUrl>http://${serverName}:${serverPort}/juddiv3/services/publish</publishUrl>
+ <securityUrl>http://${serverName}:${serverPort}/juddiv3/services/security</securityUrl>
+ <subscriptionUrl>http://${serverName}:${serverPort}/juddiv3/services/subscription</subscriptionUrl>
+ <subscriptionListenerUrl>http://${serverName}:${serverPort}/juddiv3/services/subscription-listener</subscriptionListenerUrl>
+ <juddiApiUrl>http://${serverName}:${serverPort}/juddiv3/services/juddi-api</juddiApiUrl>
+ </node>
+ </nodes>
+ </client>
+</uddi>
Modified: juddi/trunk/juddi-gui/src/main/webapp/editSubscription.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/editSubscription.jsp?rev=1540526&r1=1540525&r2=1540526&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/editSubscription.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/editSubscription.jsp Sun Nov 10 19:33:45 2013
@@ -395,15 +395,16 @@
</div>
<div id="collapse4" class="accordion-body collapse">
<div class="accordion-inner">
+ <a name="step4anchor"></a>
<div style="float:left"><%=ResourceLoader.GetResource(session, "items.maxrecords.callback")%>
- <a href="#" class="uddi_tooltips" data-toggle="tooltip" data-container="body" title="<%=ResourceLoader.GetResource(session, "items.maxrecords.callback.tooltip")%>"><i class="icon-question-sign"></i></a>: </div>
+ <a href="#step4anchor" class="uddi_tooltips" data-toggle="tooltip" data-container="body" title="<%=ResourceLoader.GetResource(session, "items.maxrecords.callback.tooltip")%>"><i class="icon-question-sign"></i></a>: </div>
<div class="edit" id="maxRecords"><%
if (sub.getMaxEntities() != null) {
sub.getMaxEntities().toString();
}
%></div>
<div style="float:left"><%=ResourceLoader.GetResource(session, "items.subscriptionbrief")%>
- <a href="#" class="uddi_tooltips" data-toggle="tooltip" data-container="body" title="<%=ResourceLoader.GetResource(session, "items.subscriptionbrief.tooltip")%>"><i class="icon-question-sign"></i></a>: </div>
+ <a href="#step4anchor" class="uddi_tooltips" data-toggle="tooltip" data-container="body" title="<%=ResourceLoader.GetResource(session, "items.subscriptionbrief.tooltip")%>"><i class="icon-question-sign"></i></a>: </div>
<div> <input type="checkbox" id="brief"
<%
out.write(sub.isBrief() ? "checked" : "");
@@ -412,7 +413,7 @@
<%=ResourceLoader.GetResource(session, "items.expiration")%>:
<div id="datetimepicker2" class="input-append date">
<input data-format="MM/dd/yyyy HH:mm:ss PP" type="text" value="<%
- if (sub.getExpiresAfter() != null) {
+ if (sub.getExpiresAfter() != null && !newitem) {
Date d = sub.getExpiresAfter().toGregorianCalendar().getTime();
DateFormat dateFormat = new SimpleDateFormat("MM/dd/yyyy HH:mm:ss a");
String dateStr = dateFormat.format(d);
@@ -460,8 +461,7 @@
defaultTime: '00:05:00',
showSeconds: true,
template: 'modal',
- showSeconds: true,
- showMeridian: false
+ showMeridian: false
});
</script>
<br>
Modified: juddi/trunk/juddi-gui/src/main/webapp/header-top.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/header-top.jsp?rev=1540526&r1=1540525&r2=1540526&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/header-top.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/header-top.jsp Sun Nov 10 19:33:45 2013
@@ -114,11 +114,11 @@
<ul class="nav">
<li class="dropdown"><a href="home.jsp" data-toggle="dropdown" class="dropdowb-town"><i class="icon-home icon-large"></i><%=ResourceLoader.GetResource(session, "navbar.home")%><b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><i class="icon-signin" title="<%=ResourceLoader.GetResource(session, "navbar.login.required")%>"></i><a href="reginfo.jsp" title="<%=ResourceLoader.GetResource(session, "navbar.create.mybiz.tooltip")%>"><%=ResourceLoader.GetResource(session, "navbar.create.mybiz")%></a></li>
- <li><i class="icon-signin" title="<%=ResourceLoader.GetResource(session, "navbar.login.required")%>"></i><a href="assertions.jsp" title="<%=ResourceLoader.GetResource(session, "navbar.publisherassertions.tooltip")%>"><%=ResourceLoader.GetResource(session, "navbar.publisherassertions")%></a></li>
- <li><i class="icon-signin" title="<%=ResourceLoader.GetResource(session, "navbar.login.required")%>"></i><a href="transfer.jsp" title="<%=ResourceLoader.GetResource(session, "navbar.transfer.tooltip")%>"><%=ResourceLoader.GetResource(session, "navbar.transfer")%></a></li>
+ <li><a href="reginfo.jsp" title="<%=ResourceLoader.GetResource(session, "navbar.create.mybiz.tooltip")%>"><%=ResourceLoader.GetResource(session, "navbar.create.mybiz")%></a></li>
+ <li><a href="assertions.jsp" title="<%=ResourceLoader.GetResource(session, "navbar.publisherassertions.tooltip")%>"><%=ResourceLoader.GetResource(session, "navbar.publisherassertions")%></a></li>
+ <li><a href="transfer.jsp" title="<%=ResourceLoader.GetResource(session, "navbar.transfer.tooltip")%>"><%=ResourceLoader.GetResource(session, "navbar.transfer")%></a></li>
<li class="divider"></li>
- <li><i class="icon-signin" title="<%=ResourceLoader.GetResource(session, "navbar.login.required")%>"></i><a href="viewSubscriptions.jsp" title="<%=ResourceLoader.GetResource(session, "navbar.subscriptions.view.tooltip")%>"><%=ResourceLoader.GetResource(session, "navbar.subscriptions.view")%></a></li>
+ <li><a href="viewSubscriptions.jsp" title="<%=ResourceLoader.GetResource(session, "navbar.subscriptions.view.tooltip")%>"><%=ResourceLoader.GetResource(session, "navbar.subscriptions.view")%></a></li>
<li><a href="editSubscription.jsp" title="<%=ResourceLoader.GetResource(session, "navbar.subscriptions.create.tooltip")%>"><%=ResourceLoader.GetResource(session, "navbar.subscriptions.create")%></a></li>
<li><a href="subscriptionFeed.jsp" title="<%=ResourceLoader.GetResource(session, "navbar.subscriptions.feed.tooltip")%>"><%=ResourceLoader.GetResource(session, "navbar.subscriptions.feed")%></a></li>
</ul>
@@ -147,7 +147,7 @@
<li><a href="importFromWadl.jsp" title="<%=ResourceLoader.GetResource(session, "navbar.create.serviceimport.tooltip.wadl")%>"><%=ResourceLoader.GetResource(session, "navbar.create.serviceimport.wadl")%></a></li>
<li><a href="tmodelEditor.jsp" title="<%=ResourceLoader.GetResource(session, "navbar.create.tmodel.tooltip")%>"><%=ResourceLoader.GetResource(session, "navbar.create.tmodel")%></a></li>
<li><a href="tmodelPartitions.jsp" title="<%=ResourceLoader.GetResource(session, "navbar.create.tmodelkeygen.tooltip")%>"><%=ResourceLoader.GetResource(session, "navbar.create.tmodelkeygen")%></a></li>
- <li><a href="editSubscription.jsp" title="<%=ResourceLoader.GetResource(session, "navbar.subscriptions.create.tooltip")%>"><%=ResourceLoader.GetResource(session, "nnavbar.subscriptions")%></a></li>
+ <li><a href="editSubscription.jsp" title="<%=ResourceLoader.GetResource(session, "navbar.subscriptions.create.tooltip")%>"><%=ResourceLoader.GetResource(session, "navbar.subscriptions")%></a></li>
<li><a href="advanced.jsp" title="<%=ResourceLoader.GetResource(session, "navbar.advanced")%>"><%=ResourceLoader.GetResource(session, "navbar.advanced")%></a></li>
</ul>
</li>
Copied: juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/jaxb/PrintJUDDI.java (from r1534826, juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/jaxb/PrintUDDI.java)
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/jaxb/PrintJUDDI.java?p2=juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/jaxb/PrintJUDDI.java&p1=juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/jaxb/PrintUDDI.java&r1=1534826&r2=1540526&rev=1540526&view=diff
==============================================================================
--- juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/jaxb/PrintUDDI.java (original)
+++ juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/jaxb/PrintJUDDI.java Sun Nov 10 19:33:45 2013
@@ -23,16 +23,17 @@ import javax.xml.bind.Marshaller;
import javax.xml.namespace.QName;
/**
- * @author <a href="mailto:kstam@apache.org">Kurt T Stam</a>
+ * This is for printing jUDDI specific data objects only
+ * @author <a href="mailto:alexoree@apache.org">Alex O'Ree</a>
* @param <T>
*/
-public class PrintUDDI<T> {
+public class PrintJUDDI<T> {
static JAXBContext jaxbContext = null;
private Marshaller getUDDIMarshaller() throws JAXBException {
if (jaxbContext==null) {
- jaxbContext=JAXBContext.newInstance("org.uddi.api_v3");
+ jaxbContext=JAXBContext.newInstance("org.apache.juddi.api_v3");
}
Marshaller marshaller = jaxbContext.createMarshaller();
marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE);
Modified: juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/jaxb/PrintUDDI.java
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/jaxb/PrintUDDI.java?rev=1540526&r1=1540525&r2=1540526&view=diff
==============================================================================
--- juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/jaxb/PrintUDDI.java (original)
+++ juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/jaxb/PrintUDDI.java Sun Nov 10 19:33:45 2013
@@ -23,6 +23,7 @@ import javax.xml.bind.Marshaller;
import javax.xml.namespace.QName;
/**
+ * This is for printing UDDI v3 objects from the spec
* @author <a href="mailto:kstam@apache.org">Kurt T Stam</a>
* @param <T>
*/
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org