Author: alexoree
Date: Mon Apr 8 18:50:46 2013
New Revision: 1465720
URL: http://svn.apache.org/r1465720
Log:
removing all references to juddi specific apis, per irc conversations with Kurt
on 4/7/2013. Juddi specific APIs will be merged with a different administrative
interface
Modified:
juddi/branches/juddi-3.2.x/juddi-gui/nbproject/project.properties
juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/hub/UddiHub.java
juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/search.jsp
juddi/branches/juddi-3.2.x/juddi-gui/web/header-bottom.jsp
juddi/branches/juddi-3.2.x/juddi-gui/web/header-top.jsp
juddi/branches/juddi-3.2.x/juddi-gui/web/publisherBrowse.jsp
juddi/branches/juddi-3.2.x/juddi-gui/web/search.jsp
Modified: juddi/branches/juddi-3.2.x/juddi-gui/nbproject/project.properties
URL:
http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/nbproject/project.properties?rev=1465720&r1=1465719&r2=1465720&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/nbproject/project.properties (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/nbproject/project.properties Mon Apr
8 18:50:46 2013
@@ -78,7 +78,7 @@ j2ee.compile.on.save=true
j2ee.copy.static.files.on.save=true
j2ee.deploy.on.save=false
j2ee.platform=1.5
-j2ee.platform.classpath=${j2ee.server.home}/lib/annotations-api.jar:${j2ee.server.home}/lib/catalina-ant.jar:${j2ee.server.home}/lib/catalina-ha.jar:${j2ee.server.home}/lib/catalina-tribes.jar:${j2ee.server.home}/lib/catalina.jar:${j2ee.server.home}/lib/commons-discovery-0.2.jar:${j2ee.server.home}/lib/derby-10.4.2.0.jar:${j2ee.server.home}/lib/el-api.jar:${j2ee.server.home}/lib/jasper-el.jar:${j2ee.server.home}/lib/jasper.jar:${j2ee.server.home}/lib/jsp-api.jar:${j2ee.server.home}/lib/log4j-1.2.13.jar:${j2ee.server.home}/lib/mysql-connector-java-5.1.6.jar:${j2ee.server.home}/lib/servlet-api.jar:${j2ee.server.home}/lib/tomcat-coyote.jar:${j2ee.server.home}/lib/tomcat-dbcp.jar:${j2ee.server.home}/lib/tomcat-i18n-es.jar:${j2ee.server.home}/lib/tomcat-i18n-fr.jar:${j2ee.server.home}/lib/tomcat-i18n-ja.jar:${j2ee.server.home}/bin/tomcat-juli.jar
+j2ee.platform.classpath=${j2ee.server.home}/lib/annotations-api.jar:${j2ee.server.home}/lib/catalina-ant.jar:${j2ee.server.home}/lib/catalina-ha.jar:${j2ee.server.home}/lib/catalina-tribes.jar:${j2ee.server.home}/lib/catalina.jar:${j2ee.server.home}/lib/commons-discovery-0.2.jar:${j2ee.server.home}/lib/derby-10.4.2.0.jar:${j2ee.server.home}/lib/derbyclient-10.9.1.0.jar:${j2ee.server.home}/lib/el-api.jar:${j2ee.server.home}/lib/jasper-el.jar:${j2ee.server.home}/lib/jasper.jar:${j2ee.server.home}/lib/jsp-api.jar:${j2ee.server.home}/lib/log4j-1.2.13.jar:${j2ee.server.home}/lib/mysql-connector-java-5.1.6.jar:${j2ee.server.home}/lib/postgresql-9.2-1002.jdbc4.jar:${j2ee.server.home}/lib/servlet-api.jar:${j2ee.server.home}/lib/tomcat-coyote.jar:${j2ee.server.home}/lib/tomcat-dbcp.jar:${j2ee.server.home}/lib/tomcat-i18n-es.jar:${j2ee.server.home}/lib/tomcat-i18n-fr.jar:${j2ee.server.home}/lib/tomcat-i18n-ja.jar:${j2ee.server.home}/bin/tomcat-juli.jar
j2ee.server.type=Tomcat
jar.compress=false
javac.classpath=\
Modified:
juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/hub/UddiHub.java
URL:
http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/hub/UddiHub.java?rev=1465720&r1=1465719&r2=1465720&view=diff
==============================================================================
---
juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/hub/UddiHub.java
(original)
+++
juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/hub/UddiHub.java
Mon Apr 8 18:50:46 2013
@@ -103,7 +103,7 @@ public class UddiHub {
publish = null;
custody = null;
security = null;
- juddi = null;
+ //juddi = null;
subscription = null;
}
@@ -157,7 +157,7 @@ public class UddiHub {
subscription = transport.getUDDISubscriptionService();
publish = transport.getUDDIPublishService();
custody = transport.getUDDICustodyTransferService();
- juddi = transport.getJUDDIApiService();
+ // juddi = transport.getJUDDIApiService();
BindingProvider bp = null;
Map<String, Object> context = null;
@@ -181,16 +181,16 @@ public class UddiHub {
context.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
properties.getProperty("subscriptionurl"));
- bp = (BindingProvider) juddi;
+ /*bp = (BindingProvider) juddi;
context = bp.getRequestContext();
- context.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
properties.getProperty("juddipapi"));
+ context.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
properties.getProperty("juddipapi"));*/
}
} catch (Exception ex) {
HandleException(ex);
}
}
private HttpSession session;
-
+/*
public boolean IsJuddiRegistry() {
String type = properties.getProperty("registryType");
if (type == null) {
@@ -200,7 +200,7 @@ public class UddiHub {
return true;
}
return false;
- }
+ }*/
private String GetToken() {
if (style != AuthStyle.UDDI_AUTH) {
@@ -226,11 +226,11 @@ public class UddiHub {
context.put(BindingProvider.USERNAME_PROPERTY,
session.getAttribute("username"));
context.put(BindingProvider.USERNAME_PROPERTY,
session.getAttribute(AES.Decrypt("password", (String) properties.get("key"))));
-
+ /*
bp = (BindingProvider) juddi;
context = bp.getRequestContext();
context.put(BindingProvider.USERNAME_PROPERTY,
session.getAttribute("username"));
- context.put(BindingProvider.USERNAME_PROPERTY,
session.getAttribute(AES.Decrypt("password", (String) properties.get("key"))));
+ context.put(BindingProvider.USERNAME_PROPERTY,
session.getAttribute(AES.Decrypt("password", (String)
properties.get("key"))));*/
return null;
} else {
if (token != null) {
@@ -260,7 +260,7 @@ public class UddiHub {
private UDDIInquiryPortType inquiry = null;
private UDDIPublicationPortType publish = null;
private UDDICustodyTransferPortType custody = null;
- private JUDDIApiPortType juddi = null;
+ //private JUDDIApiPortType juddi = null;
private String token = null;
public PagableContainer GetBusinessListAsHtml(int offset, int maxrecords,
String keyword, String lang) {
@@ -669,7 +669,7 @@ public class UddiHub {
* @param request
* @return
* @deprecated
- */
+
@Deprecated
public String AddPublisher(HttpServletRequest request) {
try {
@@ -687,12 +687,12 @@ public class UddiHub {
}
-
+*/
/**
* returns an html listing of Juddi authorized publishers
*
* @return
- */
+
public String GetPublisherListAsHtml() {
if (!this.IsJuddiRegistry()) {
return "This function is only available on Juddi registries";
@@ -722,7 +722,7 @@ public class UddiHub {
return HandleException(ex);
}
}
-
+*/
/**
* Adds a special tModel key generator keyGenerator: Marking a tModel with
* this categorization designates it as one whose tModelKey identifies a
key
@@ -910,7 +910,7 @@ public class UddiHub {
public enum FindType {
- Business, RelatedBusiness, Service, tModel, Publisher, BindingTemplate
+ Business, RelatedBusiness, Service, tModel, BindingTemplate
}
public enum CriteriaType {
@@ -926,8 +926,7 @@ public class UddiHub {
return FindBusiness(criteria, parameters, lang, findqualifier);
case RelatedBusiness:
return FindRelatedBusiness(criteria, parameters, lang,
findqualifier);
- case Publisher:
- return FindPublishers(criteria, parameters, lang,
findqualifier);
+
case Service:
return FindService(criteria, parameters, lang, findqualifier);
case tModel:
@@ -1116,10 +1115,6 @@ public class UddiHub {
}
}
- private String FindPublishers(CriteriaType criteria, String parameters,
String lang, String[] fq) {
- //TODO implement
- throw new UnsupportedOperationException("Not yet implemented");
- }
private String FindService(CriteriaType criteria, String parameters,
String lang, String[] fq) {
try {
Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/search.jsp
URL:
http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/search.jsp?rev=1465720&r1=1465719&r2=1465720&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/search.jsp (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/search.jsp Mon Apr 8
18:50:46 2013
@@ -61,9 +61,7 @@
if (searchfor.equalsIgnoreCase("tModel")) {
type = FindType.tModel;
}
- if (searchfor.equalsIgnoreCase("Publisher")) {
- type = FindType.Publisher;
- }
+
if (searchfor.equalsIgnoreCase("RelatedBusiness")) {
type = FindType.RelatedBusiness;
}
Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/header-bottom.jsp
URL:
http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/header-bottom.jsp?rev=1465720&r1=1465719&r2=1465720&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/header-bottom.jsp (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/header-bottom.jsp Mon Apr 8
18:50:46 2013
@@ -4,6 +4,13 @@
Author : Alex O'Ree
--%>
+<%@page import="java.io.IOException"%>
+<%@page import="java.util.jar.Attributes"%>
+<%@page import="java.util.jar.Manifest"%>
+<%@page import="java.io.InputStream"%>
+<%@page import="java.util.jar.JarFile"%>
+<%@page import="java.net.URL"%>
+<%@page import="java.util.Enumeration"%>
<%@page import="org.apache.juddi.webconsole.resources.ResourceLoader"%>
<%@page contentType="text/html" pageEncoding="UTF-8"%>
@@ -21,8 +28,8 @@
<h3>As XML</h3>
</div>
<div class="modal-body" id="viewAsXmlContent">
-
-
+
+
</div>
<div class="modal-footer">
<a href="#" class="btn"><%=ResourceLoader.GetResource(session,
"modal.close")%></a>
@@ -30,6 +37,39 @@
</div>
</div> <!-- /container -->
</form>
+<div style="padding: 0px 0px 0px 0px; bottom: 0px; margin: 0px 0px 0px 0px;
width:100%; text-align: center; position: fixed"><center>BETA - v<%
+
+ Enumeration resEnum;
+ try {
+ resEnum =
Thread.currentThread().getContextClassLoader().getResources(JarFile.MANIFEST_NAME);
+ while (resEnum.hasMoreElements()) {
+ try {
+ URL url = (URL) resEnum.nextElement();
+ if (url.toString().toLowerCase().contains("juddi-client")) {
+ // out.write(url.toString() + "=");
+ InputStream is = url.openStream();
+ if (is != null) {
+ Manifest manifest = new Manifest(is);
+ Attributes mainAttribs = manifest.getMainAttributes();
+ String version =
mainAttribs.getValue("Bundle-Version");
+ if (version != null) {
+ out.write(version);
+ // out.write("<br>");
+ }
+ }
+ }
+ } catch (Exception e) {
+ // Silently ignore wrong manifests on classpath?
+ }
+ }
+ } catch (IOException e1) {
+ // Silently ignore wrong manifests on classpath?
+ }
+
+
+
+
+ %></center></div>
</body>
</html>
Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/header-top.jsp
URL:
http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/header-top.jsp?rev=1465720&r1=1465719&r2=1465720&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/header-top.jsp (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/header-top.jsp Mon Apr 8 18:50:46
2013
@@ -37,7 +37,7 @@
}
}
if (session.getAttribute("locale")==null){
- //last change, default to english
+ //last chance, default to english
session.setAttribute("locale", "en");
}
%>
@@ -114,10 +114,12 @@
<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>
<%
- if (hub.IsJuddiRegistry()) {
- %>
- <li><a href="tmodelBrowse.jsp"
title="<%=ResourceLoader.GetResource(session,
"navbar.create.publisher.tooltip")%>"><%=ResourceLoader.GetResource(session,
"navbar.create.publisher")%></a></li>
- <%
}
+ // if (hub.IsJuddiRegistry()) {
+
+ //<li><a href="tmodelBrowse.jsp"
title="<%=ResourceLoader.GetResource(session,
"navbar.create.publisher.tooltip")%>"><%=ResourceLoader.GetResource(session,
"navbar.create.publisher")%></a></li>
+
+
+ //
}
%>
</ul>
</li>
Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/publisherBrowse.jsp
URL:
http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/publisherBrowse.jsp?rev=1465720&r1=1465719&r2=1465720&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/publisherBrowse.jsp (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/publisherBrowse.jsp Mon Apr 8
18:50:46 2013
@@ -22,7 +22,7 @@
<%
UddiHub x = UddiHub.getInstance(application,
request.getSession());
- out.write(x.GetPublisherListAsHtml());
+ //out.write(x.GetPublisherListAsHtml());
%>
</div>
<script type="text/javascript">
Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/search.jsp
URL:
http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/search.jsp?rev=1465720&r1=1465719&r2=1465720&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/search.jsp (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/search.jsp Mon Apr 8 18:50:46 2013
@@ -41,10 +41,12 @@
<button type="button" class="btn "
value="service"><%= ResourceLoader.GetResource(session,
"items.service")%></button>
<button type="button" class="btn "
value="bindingTemplate"><%= ResourceLoader.GetResource(session,
"items.bindingtemplate")%></button>
<button type="button" class="btn "
value="tModel"><%= ResourceLoader.GetResource(session,
"items.tmodel")%></button>
- <% if (x.IsJuddiRegistry()) {
- %>
- <button type="button" class="btn " ><%=
ResourceLoader.GetResource(session, "items.publisher")%></button>
- <% }
+ <%
+ //if (x.IsJuddiRegistry()) {
+
+ //<button type="button" class="btn " ><%=
ResourceLoader.GetResource(session, "items.publisher")%></button>
+
+ //}
%>
</div><br><Br>
<%= ResourceLoader.GetResource(session,
"search.criteria")%><br>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
