Author: alexoree
Date: Tue Jul 30 16:52:14 2013
New Revision: 1508517
URL: http://svn.apache.org/r1508517
Log:
JUDDI-610 added queries for juddi-gui tmodelEditor.jsp to search for references
to the tmodel (service, biz, binding)
JUDDI-579 fixed the WSDL import page to have the correct text
updated readme for some common build issues
Modified:
juddi/trunk/juddi-examples/uddi-samples/nbproject/build-impl.xml
juddi/trunk/juddi-examples/uddi-samples/nbproject/genfiles.properties
juddi/trunk/juddi-gui-dsig/ (props changed)
juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/UddiHub.java
juddi/trunk/juddi-gui/src/main/webapp/importFromWsdl.jsp
juddi/trunk/juddi-gui/src/main/webapp/tmodelEditor.jsp
juddi/trunk/readme.txt
Modified: juddi/trunk/juddi-examples/uddi-samples/nbproject/build-impl.xml
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/uddi-samples/nbproject/build-impl.xml?rev=1508517&r1=1508516&r2=1508517&view=diff
==============================================================================
--- juddi/trunk/juddi-examples/uddi-samples/nbproject/build-impl.xml (original)
+++ juddi/trunk/juddi-examples/uddi-samples/nbproject/build-impl.xml Tue Jul 30
16:52:14 2013
@@ -370,6 +370,11 @@ is divided into following sections:
</and>
</condition>
</target>
+ <target name="-init-test-properties">
+ <property name="test.binaryincludes" value="<nothing>"/>
+ <property name="test.binarytestincludes" value=""/>
+ <property name="test.binaryexcludes" value=""/>
+ </target>
<target if="${nb.junit.single}" name="-init-macrodef-junit-single"
unless="${nb.junit.batch}">
<macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3";>
<attribute default="${includes}" name="includes"/>
@@ -393,7 +398,7 @@ is divided into following sections:
</sequential>
</macrodef>
</target>
- <target if="${nb.junit.batch}" name="-init-macrodef-junit-batch"
unless="${nb.junit.single}">
+ <target depends="-init-test-properties" if="${nb.junit.batch}"
name="-init-macrodef-junit-batch" unless="${nb.junit.single}">
<macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3";>
<attribute default="${includes}" name="includes"/>
<attribute default="${excludes}" name="excludes"/>
@@ -407,6 +412,9 @@ is divided into following sections:
<fileset dir="${test.src.dir}"
excludes="@{excludes},${excludes}" includes="@{includes}">
<filename name="@{testincludes}"/>
</fileset>
+ <fileset dir="${build.test.classes.dir}"
excludes="@{excludes},${excludes},${test.binaryexcludes}"
includes="${test.binaryincludes}">
+ <filename name="${test.binarytestincludes}"/>
+ </fileset>
</batchtest>
<syspropertyset>
<propertyref prefix="test-sys-prop."/>
@@ -534,7 +542,7 @@ is divided into following sections:
</sequential>
</macrodef>
</target>
- <target if="${nb.junit.batch}" name="-init-macrodef-junit-debug-batch">
+ <target depends="-init-test-properties" if="${nb.junit.batch}"
name="-init-macrodef-junit-debug-batch">
<macrodef name="junit-debug"
uri="http://www.netbeans.org/ns/j2se-project/3";>
<attribute default="${includes}" name="includes"/>
<attribute default="${excludes}" name="excludes"/>
@@ -548,6 +556,9 @@ is divided into following sections:
<fileset dir="${test.src.dir}"
excludes="@{excludes},${excludes}" includes="@{includes}">
<filename name="@{testincludes}"/>
</fileset>
+ <fileset dir="${build.test.classes.dir}"
excludes="@{excludes},${excludes},${test.binaryexcludes}"
includes="${test.binaryincludes}">
+ <filename name="${test.binarytestincludes}"/>
+ </fileset>
</batchtest>
<syspropertyset>
<propertyref prefix="test-sys-prop."/>
@@ -920,7 +931,7 @@ is divided into following sections:
<target if="has.persistence.xml" name="-copy-persistence-xml">
<mkdir dir="${build.classes.dir}/META-INF"/>
<copy todir="${build.classes.dir}/META-INF">
- <fileset dir="${meta.inf.dir}" includes="persistence.xml"/>
+ <fileset dir="${meta.inf.dir}" includes="persistence.xml orm.xml"/>
</copy>
</target>
<target name="-post-compile">
Modified: juddi/trunk/juddi-examples/uddi-samples/nbproject/genfiles.properties
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/uddi-samples/nbproject/genfiles.properties?rev=1508517&r1=1508516&r2=1508517&view=diff
==============================================================================
--- juddi/trunk/juddi-examples/uddi-samples/nbproject/genfiles.properties
(original)
+++ juddi/trunk/juddi-examples/uddi-samples/nbproject/genfiles.properties Tue
Jul 30 16:52:14 2013
@@ -4,5 +4,5 @@ [email protected]
# This file is used by a NetBeans-based IDE to track changes in generated
files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never
regenerate such files for you.
nbproject/build-impl.xml.data.CRC32=0762664b
-nbproject/build-impl.xml.script.CRC32=e187bf83
-nbproject/[email protected]
+nbproject/build-impl.xml.script.CRC32=2aaa782f
+nbproject/[email protected]
Propchange: juddi/trunk/juddi-gui-dsig/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Jul 30 16:52:14 2013
@@ -4,3 +4,4 @@ dist
.classpath
.project
target
+nbproject
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=1508517&r1=1508516&r2=1508517&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 Jul 30 16:52:14 2013
@@ -1687,7 +1687,10 @@ public class UddiHub {
fb.setName(n);
break;
case tmodel:
-
+ fb.setCategoryBag(new CategoryBag());
+ KeyedReference kr2 = new KeyedReference();
+ kr2.setTModelKey(parameters);
+ fb.getCategoryBag().getKeyedReference().add(kr2);
//TODO
break;
case uid:
Modified: juddi/trunk/juddi-gui/src/main/webapp/importFromWsdl.jsp
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/importFromWsdl.jsp?rev=1508517&r1=1508516&r2=1508517&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/importFromWsdl.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/importFromWsdl.jsp Tue Jul 30
16:52:14 2013
@@ -1,5 +1,5 @@
<%--
- Document : importFromWadl
+ Document : importFromWsdl
Created on : July 11, 2013, 6:52:05 PM
Author : Alex O'Ree
--%>
@@ -16,14 +16,14 @@
<!-- Main hero unit for a primary marketing message or call to action -->
<div class="well" >
- <h1><%=ResourceLoader.GetResource(session,
"navbar.create.serviceimport.wadl")%></h1>
+ <h1><%=ResourceLoader.GetResource(session,
"navbar.create.serviceimport")%></h1>
</div>
<!-- Example row of columns -->
<div class="row">
<div class="span12" >
- <%=ResourceLoader.GetResource(session,
"pages.serviceimport.content.wadl")%>
+ <%=ResourceLoader.GetResource(session,
"pages.serviceimport.content")%>
<Br>
<br>
@@ -31,13 +31,13 @@
<div class="accordion-group">
<div class="accordion-heading">
<a class="accordion-toggle" data-toggle="collapse"
data-parent="#accordion2" href="#collapse1">
- <%=ResourceLoader.GetResource(session,
"pages.serviceimport.content.step1.wadl")%>
+ <%=ResourceLoader.GetResource(session,
"pages.serviceimport.content.step1")%>
</a>
</div>
<div id="collapse1" class="accordion-body collapse in">
<div class="accordion-inner">
- <%=ResourceLoader.GetResource(session,
"pages.serviceimport.content.step1a.wadl")%><br>
- <input type="text" id="wsdlurl"
placeholder="http://localhost:8080/services/myService?wadl"; style="width:100%"
><br>
+ <%=ResourceLoader.GetResource(session,
"pages.serviceimport.content.step1a")%><br>
+ <input type="text" id="wsdlurl"
placeholder="http://localhost:8080/services/myService?wsdl"; style="width:100%"
><br>
<%=ResourceLoader.GetResource(session,
"pages.serviceimport.content.step1b")%><br>
<%
if (!request.isSecure()) {
@@ -102,7 +102,7 @@
function save(preview)
{
var postbackdata = new Array();
- var url='ajax/importFromWadl.jsp';
+ var url='ajax/importFromWsdl.jsp';
postbackdata.push({
name:"nonce",
value: $("#nonce").val()
Modified: juddi/trunk/juddi-gui/src/main/webapp/tmodelEditor.jsp
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/tmodelEditor.jsp?rev=1508517&r1=1508516&r2=1508517&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/tmodelEditor.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/tmodelEditor.jsp Tue Jul 30 16:52:14
2013
@@ -59,6 +59,9 @@
<li><a href="#identifiers"
><%=ResourceLoader.GetResource(session,
"pages.editor.tabnav.identifiers")%></a></li>
<li><a href="#signatures"
id="sigtagheader"><%=ResourceLoader.GetResource(session,
"pages.editor.tabnav.signatures")%></a></li>
+ <li><a href="#Instances" >Instances</a></li>
+
+
</ul>
<script type="text/javascript">
$(function () {
@@ -86,6 +89,10 @@
e.preventDefault();
$(this).tab('show');
});
+ $('#myTab a[href=#Instances]').click(function (e) {
+ e.preventDefault();
+ $(this).tab('show');
+ });
var currentDescriptionEntries=<%=bd.getDescription().size()%>;
var currentOverviewDocs=<%=bd.getOverviewDoc().size()%>;
@@ -305,6 +312,109 @@
}
%>
</div>
+ <div class="tab-pane " id="Instances">
+ <b>Instances</b> - Use this to search for other entities
in this registery that reference this tModel<Br>
+ <select id="relatedSearches"
onchange="search()">
+ <option></option>
+ <option value="business">Find
businesses</option>
+ <option
value="bindingTemplate">Find binding</option>
+ <option value="service">Find
services</option>
+ <!-- <option value="tModel">Find
tModels</option>-->
+ </select>
+ <script type="text/javascript">
+
+ var offset=0;
+ var maxrecords=20;
+ function search()
+ {
+ var val = $("#relatedSearches").val();
+
+ var selection = "tmodel";
+
+ var searchfor = $("#relatedSearches").val();
+
+ var searchcontent = "<%
+ if (bd.getTModelKey()!=null)
+
out.write(StringEscapeUtils.escapeJavaScript(bd.getTModelKey()));
+ %>";
+
+ var url='ajax/search.jsp';
+
+ var postbackdata = new Array();
+
+ postbackdata.push({
+ name:"selection",
+ value: selection
+ });
+
+ postbackdata.push({
+ name:"searchcontent",
+ value: searchcontent
+ });
+
+ //postbackdata.push({
+ //name:"lang",
+ //value: $("#lang").val()
+ //});
+
+
+ /*$.each($('input:checkbox'), function(index,item){
+ var itemname = item.name;
+ if (item.checked)
+ {
+ postbackdata.push({
+ name:"findqualifier",
+ value: itemname
+ });
+ }
+ });
+ */
+
+ postbackdata.push({
+ name:"searchfor",
+ value: searchfor
+ });
+
+ postbackdata.push({
+ name:"nonce",
+ value: $("#nonce").val()
+ });
+
+ var request= $.ajax({
+ url: url,
+ type:"POST",
+ // dataType: "html",
+ cache: false,
+ // processData: false,f
+ data: postbackdata
+ });
+
+
+ request.done(function(msg) {
+ window.console && console.log('postback done ' + url);
+
+ $("#InstancesContainer").html(msg);
+
+
+ });
+
+ request.fail(function(jqXHR, textStatus) {
+ window.console && console.log('postback failed ' + url);
+ $("#InstancesContainer").html(jqXHR.responseText +
textStatus);
+ //$(".alert").alert();
+
+
+ });
+
+ }
+
+ </script>
+ <div id="InstancesContainer" style="border-width: 2px;
border-style: solid;" >
+ <%
+
+ %>
+ </div>
+ </div>
<div><br>
<%
if (bd.getSignature().isEmpty()) {
@@ -333,6 +443,10 @@
</div>
+
+
+
+
</div>
<script src="js/tmodeledit.js"></script>
<script src="js/businessEditor.js"></script>
Modified: juddi/trunk/readme.txt
URL:
http://svn.apache.org/viewvc/juddi/trunk/readme.txt?rev=1508517&r1=1508516&r2=1508517&view=diff
==============================================================================
--- juddi/trunk/readme.txt (original)
+++ juddi/trunk/readme.txt Tue Jul 30 16:52:14 2013
@@ -30,4 +30,115 @@ mvn clean install
To start Juddi's embedded Tomcat server:
juddi-tomcat\target\tomcat\apache-tomcat-6.0.26\bin\startup.bat
-juddi-tomcat\target\tomcat\apache-tomcat-6.0.26\bin\startup.sh
\ No newline at end of file
+juddi-tomcat\target\tomcat\apache-tomcat-6.0.26\bin\startup.sh
+
+
+
+When building on Windows, you may run into an error similar to this:
+
+SEVERE: The business service was not found for the given key:
uddi:uddi.joepublisher.com:serviceone
+org.apache.juddi.v3.error.InvalidKeyPassedException: The business service was
not found for the given key: uddi:uddi.jo
+epublisher.com:serviceone
+ at
org.apache.juddi.validation.ValidatePublish.validateDeleteService(ValidatePublish.java:174)
+ at
org.apache.juddi.api.impl.UDDIPublicationImpl.deleteService(UDDIPublicationImpl.java:291)
+ at
org.apache.juddi.v3.tck.TckBusinessService.deleteService(TckBusinessService.java:228)
+ at
org.apache.juddi.v3.tck.TckBusinessService.deleteJoePublisherService(TckBusinessService.java:85)
+ at
org.apache.juddi.subscription.SubscriptionNotifierTest.teardown(SubscriptionNotifierTest.java:173)
+ at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+ at
sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
+ at
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
+ at java.lang.reflect.Method.invoke(Method.java:597)
+ at
org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:44)
+ at
org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:15)
+ at
org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:41)
+ at
org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:37)
+ at org.junit.runners.ParentRunner.run(ParentRunner.java:220)
+ at
org.apache.maven.surefire.junit4.JUnit4Provider.execute(JUnit4Provider.java:252)
+ at
org.apache.maven.surefire.junit4.JUnit4Provider.executeTestSet(JUnit4Provider.java:141)
+ at
org.apache.maven.surefire.junit4.JUnit4Provider.invoke(JUnit4Provider.java:112)
+ at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+ at
sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
+ at
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
+ at java.lang.reflect.Method.invoke(Method.java:597)
+ at
org.apache.maven.surefire.util.ReflectionUtils.invokeMethodWithArray(ReflectionUtils.java:189)
+ at
org.apache.maven.surefire.booter.ProviderFactory$ProviderProxy.invoke(ProviderFactory.java:165)
+ at
org.apache.maven.surefire.booter.ProviderFactory.invokeProvider(ProviderFactory.java:85)
+ at
org.apache.maven.surefire.booter.ForkedBooter.runSuitesInProcess(ForkedBooter.java:115)
+ at
org.apache.maven.surefire.booter.ForkedBooter.main(ForkedBooter.java:75)
+Tests run: 2, Failures: 1, Errors: 1, Skipped: 0, Time elapsed: 3.661 sec <<<
FAILURE!
+testGetSubscriptionResults(org.apache.juddi.subscription.SubscriptionNotifierTest)
Time elapsed: 0.005 sec <<< ERROR!
+java.lang.NullPointerException
+ at
org.apache.juddi.subscription.SubscriptionNotifierTest.testGetSubscriptionResults(SubscriptionNotifierTest.ja
+va:146)
+ at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+ at
sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
+ at
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
+ at java.lang.reflect.Method.invoke(Method.java:597)
+ at
org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:44)
+ at
org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:15)
+ at
org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:41)
+ at
org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:20)
+ at
org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:28)
+ at
org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:31)
+ at
org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:73)
+ at
org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:46)
+ at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:180)
+ at org.junit.runners.ParentRunner.access$000(ParentRunner.java:41)
+ at org.junit.runners.ParentRunner$1.evaluate(ParentRunner.java:173)
+ at
org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:28)
+ at
org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:31)
+ at org.junit.runners.ParentRunner.run(ParentRunner.java:220)
+ at
org.apache.maven.surefire.junit4.JUnit4Provider.execute(JUnit4Provider.java:252)
+ at
org.apache.maven.surefire.junit4.JUnit4Provider.executeTestSet(JUnit4Provider.java:141)
+ at
org.apache.maven.surefire.junit4.JUnit4Provider.invoke(JUnit4Provider.java:112)
+ at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+ at
sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
+ at
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
+ at java.lang.reflect.Method.invoke(Method.java:597)
+ at
org.apache.maven.surefire.util.ReflectionUtils.invokeMethodWithArray(ReflectionUtils.java:189)
+ at
org.apache.maven.surefire.booter.ProviderFactory$ProviderProxy.invoke(ProviderFactory.java:165)
+ at
org.apache.maven.surefire.booter.ProviderFactory.invokeProvider(ProviderFactory.java:85)
+ at
org.apache.maven.surefire.booter.ForkedBooter.runSuitesInProcess(ForkedBooter.java:115)
+ at
org.apache.maven.surefire.booter.ForkedBooter.main(ForkedBooter.java:75)
+
+org.apache.juddi.subscription.SubscriptionNotifierTest Time elapsed: 0.038
sec <<< FAILURE!
+java.lang.AssertionError: No exception should be thrown.
+ at org.junit.Assert.fail(Assert.java:91)
+ at
org.apache.juddi.v3.tck.TckBusinessService.deleteService(TckBusinessService.java:232)
+ at
org.apache.juddi.v3.tck.TckBusinessService.deleteJoePublisherService(TckBusinessService.java:85)
+ at
org.apache.juddi.subscription.SubscriptionNotifierTest.teardown(SubscriptionNotifierTest.java:173)
+ at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+ at
sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
+ at
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
+ at java.lang.reflect.Method.invoke(Method.java:597)
+ at
org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:44)
+ at
org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:15)
+ at
org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:41)
+ at
org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:37)
+ at org.junit.runners.ParentRunner.run(ParentRunner.java:220)
+ at
org.apache.maven.surefire.junit4.JUnit4Provider.execute(JUnit4Provider.java:252)
+ at
org.apache.maven.surefire.junit4.JUnit4Provider.executeTestSet(JUnit4Provider.java:141)
+ at
org.apache.maven.surefire.junit4.JUnit4Provider.invoke(JUnit4Provider.java:112)
+ at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+ at
sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
+ at
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
+ at java.lang.reflect.Method.invoke(Method.java:597)
+ at
org.apache.maven.surefire.util.ReflectionUtils.invokeMethodWithArray(ReflectionUtils.java:189)
+ at
org.apache.maven.surefire.booter.ProviderFactory$ProviderProxy.invoke(ProviderFactory.java:165)
+ at
org.apache.maven.surefire.booter.ProviderFactory.invokeProvider(ProviderFactory.java:85)
+ at
org.apache.maven.surefire.booter.ForkedBooter.runSuitesInProcess(ForkedBooter.java:115)
+ at
org.apache.maven.surefire.booter.ForkedBooter.main(ForkedBooter.java:75)
+
+
+Results :
+
+Failed tests: org.apache.juddi.subscription.SubscriptionNotifierTest: No
exception should be thrown.
+
+Tests in error:
+
testGetSubscriptionResults(org.apache.juddi.subscription.SubscriptionNotifierTest)
+
+Tests run: 141, Failures: 1, Errors: 1, Skipped: 0
+
+Right click properties on the check out folder and uncheck the read only flag
on the folder, then build again.
+
+If that doesn't work and you have SOAP UI running, close it.
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
