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/06 00:19:19 UTC
svn commit: r1539189 - in /juddi/trunk: juddi-core/src/test/resources/
juddi-gui/ juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/
juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/
juddi-gui/src/main/webapp/ juddi-gui/src/main...
Author: alexoree
Date: Tue Nov 5 23:19:19 2013
New Revision: 1539189
URL: http://svn.apache.org/r1539189
Log:
JUDDI-692 fixed settings page
JUDDI-683 done, banners and title bars are now adjustable via src/main/webapp/user/banner.jsp
Added:
juddi/trunk/juddi-gui/src/main/webapp/user/
juddi/trunk/juddi-gui/src/main/webapp/user/banner.jsp
Modified:
juddi/trunk/juddi-core/src/test/resources/juddiv3.xml
juddi/trunk/juddi-gui/readme.txt
juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/UddiHub.java
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
juddi/trunk/juddi-gui/src/main/webapp/META-INF/config.properties
juddi/trunk/juddi-gui/src/main/webapp/ajax/settings.jsp
juddi/trunk/juddi-gui/src/main/webapp/header-top.jsp
juddi/trunk/juddi-gui/src/main/webapp/settings.jsp
Modified: juddi/trunk/juddi-core/src/test/resources/juddiv3.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/test/resources/juddiv3.xml?rev=1539189&r1=1539188&r2=1539189&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/test/resources/juddiv3.xml (original)
+++ juddi/trunk/juddi-core/src/test/resources/juddiv3.xml Tue Nov 5 23:19:19 2013
@@ -142,8 +142,8 @@
<Timeout>15</Timeout>
<!-- As of 3.1.5 Duration of time for tokens to expire, regardless of inactivity -->
<Expiration>15</Expiration>
- <!-- As of 3.2, when set to true, tokens can only be used from the same IP address they were issued to -->
- <enforceSameIPRule>true</enforceSameIPRule>
+ <!-- As of 3.2, when set to true, tokens can only be used from the same IP address they were issued to -->
+ <enforceSameIPRule>true</enforceSameIPRule>
</token>
</auth>
Modified: juddi/trunk/juddi-gui/readme.txt
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/readme.txt?rev=1539189&r1=1539188&r2=1539189&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/readme.txt (original)
+++ juddi/trunk/juddi-gui/readme.txt Tue Nov 5 23:19:19 2013
@@ -3,28 +3,17 @@ The juddi-gui project is an extension to
Direction for building:
Pre-requists:
-1) Ant 1.8+
-2) Maven 3.0.x
-3) Netbeans 7.x
-4) Full source for jUDDI
-5) Java JDK 1.6+
+1) Maven 3.0.x
+2) Full source for jUDDI
+3) Oracle Java JDK 1.6+ (needed for the digital signature applet)
Build:
1) First, build the main jUDDI project.
mvn clean install
-2) Build the juddi-gui-dsig project
- cd juddi-gui-disg
- ant jar
-3) Copy the applet binaries to within the juddi-gui war
- copy dist\juddi-gui-dsig.jar ..\juddi-gui\web\applets
- mkdir ..\juddi-gui\web\applets\lib
- copy dist\lib\*.* ..\juddi-gui\web\applets\lib
-3) Build the war
- cd juddi-gui
- ant dist
-4) Deploy
+2) Deploy
copy the war file into any J2EE container that has a soap stack that supports JAX-WS 2.2 or higher
-5) Access
+ and the servlet 2.4 API spec or higher
+3) Access
http://localhost:8080/juddi-gui
-6) Configure
- Alter the contents of juddi-gui/META-INF/config.properties
\ No newline at end of file
+4) Configure
+ Alter the contents of juddi-gui/META-INF/config.properties and juddi-gui/WEB-INF/classes/META-INF/uddi.xml as necessary
\ No newline at end of file
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=1539189&r1=1539188&r2=1539189&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 Nov 5 23:19:19 2013
@@ -186,7 +186,7 @@ public class UddiHub {
in.close();
properties = p;
try {
- style = AuthStyle.valueOf((String) p.get("authtype"));
+ style = AuthStyle.valueOf((String) p.get(PROP_AUTH_TYPE));
} catch (Exception ex) {
log.info("UDDI_AUTH is not defined in the config");
style = AuthStyle.UDDI_AUTH;
@@ -3672,4 +3672,8 @@ public class UddiHub {
return HandleException(ex);
}
}
+
+ public static final String PROP_AUTH_TYPE="config.props.authtype";
+ public static final String PROP_PREFIX="config.props.";
+
}
Modified: 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=1539189&r1=1539188&r2=1539189&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web.properties (original)
+++ juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web.properties Tue Nov 5 23:19:19 2013
@@ -359,3 +359,4 @@ items.publisherassertion.add.tokey=To Ke
items.publisherassertion.add.fromkey=From Key
items.publisherassertion.add.keyname=Key Name
items.publisherassertion.add.keyvalue=Key Value
+pages.settings.loading=Loading from
Modified: juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web_es.properties
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web_es.properties?rev=1539189&r1=1539188&r2=1539189&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web_es.properties (original)
+++ juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web_es.properties Tue Nov 5 23:19:19 2013
@@ -361,3 +361,4 @@ items.publisherassertion.add.tokey=Para
items.publisherassertion.add.fromkey=Desde clave
items.publisherassertion.add.keyname=Nombre de clave
items.publisherassertion.add.keyvalue=Clave Valor
+pages.settings.loading=Carga desde
Modified: juddi/trunk/juddi-gui/src/main/webapp/META-INF/config.properties
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/META-INF/config.properties?rev=1539189&r1=1539188&r2=1539189&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/META-INF/config.properties (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/META-INF/config.properties Tue Nov 5 23:19:19 2013
@@ -1,7 +1,7 @@
#required. if this uddi client is connected to uddi services that use the auth token, then set to UDDI_AUTH
-#if not, set authtype to
-authtype=UDDI_AUTH
+#if not, set authtype to HTTP_BASIC (even if its digest or NTLM, it's all handled the same way)
+config.props.authtype=UDDI_AUTH
#future use
-#registryType=juddi
\ No newline at end of file
+#config.props.enableAutomaticLogouts=false
\ No newline at end of file
Modified: juddi/trunk/juddi-gui/src/main/webapp/ajax/settings.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/ajax/settings.jsp?rev=1539189&r1=1539188&r2=1539189&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/ajax/settings.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/ajax/settings.jsp Tue Nov 5 23:19:19 2013
@@ -12,9 +12,11 @@
<%@include file="../csrf.jsp" %>
<%
if (!request.getRemoteHost().equalsIgnoreCase("localhost") && !request.getRemoteHost().equalsIgnoreCase("127.0.0.1")) {
+ out.write("This is only accessible from the server hosting juddi-gui. sorry!")
response.setStatus(403);
}
- if (!request.isUserInRole("manager")) {
+ if (!request.isUserInRole("uddiadmin")) {
+ out.write("Sorry, you need to have the 'uddiadmin' admin role to access this page.")
response.setStatus(403);
}
if (request.getMethod().equalsIgnoreCase("post")) {
@@ -24,7 +26,7 @@
while (it.hasMoreElements()) {
String key = (String) it.nextElement();
String value = request.getParameter(key);
- if (key.equals("authtype")) {
+ if (key.startsWith(UddiHub.PROP_PREFIX)) {
p.setProperty(key, value);
}
else if (key.startsWith("client"))
@@ -50,7 +52,7 @@
if (request.getUserPrincipal() != null) {
msg += " " + request.getUserPrincipal().toString();
}
- p.store(fos, "Edited at " + System.currentTimeMillis() + " by " + request.getRemoteUser() + request.getUserPrincipal().getName());
+ p.store(fos, msg);
fos.close();
} catch (Exception ex) {
response.setStatus(500);
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=1539189&r1=1539188&r2=1539189&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/header-top.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/header-top.jsp Tue Nov 5 23:19:19 2013
@@ -89,6 +89,7 @@
</head>
<body>
+ <%@include file="user/banner.jsp" %>
<form id="uddiform">
<%@include file="csrf.jsp" %>
<input type="hidden" name="nonce" id="nonce" value="<%=StringEscapeUtils.escapeHtml((String) session.getAttribute("nonce"))%>" />
@@ -97,6 +98,7 @@
<%
UddiHub hub = UddiHub.getInstance(application, session);
%>
+
<div class="navbar navbar-inverse navbar-fixed-top">
<div class="navbar-inner">
Modified: juddi/trunk/juddi-gui/src/main/webapp/settings.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/settings.jsp?rev=1539189&r1=1539188&r2=1539189&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/settings.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/settings.jsp Tue Nov 5 23:19:19 2013
@@ -29,10 +29,11 @@
%>
- Loading from <%=StringEscapeUtils.escapeHtml(x.GetJuddiClientConfig().getConfigurationFile())%><br>
- Loading from <%=StringEscapeUtils.escapeHtml(x.GetRawConfigurationPath())%>
+ <%=ResourceLoader.GetResource(session, "pages.settings.loading")%> <%=StringEscapeUtils.escapeHtml(x.GetJuddiClientConfig().getConfigurationFile())%><br>
+ <%=ResourceLoader.GetResource(session, "pages.settings.loading")%> <%=StringEscapeUtils.escapeHtml(x.GetRawConfigurationPath())%>
<table class="table table-hover">
- <tr><th>Key</th><th>Value</th></tr>
+ <tr><th><%=ResourceLoader.GetResource(session, "items.key")%></th>
+ <th><%=ResourceLoader.GetResource(session, "items.value")%></th></tr>
<%
Added: juddi/trunk/juddi-gui/src/main/webapp/user/banner.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/user/banner.jsp?rev=1539189&view=auto
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/user/banner.jsp (added)
+++ juddi/trunk/juddi-gui/src/main/webapp/user/banner.jsp Tue Nov 5 23:19:19 2013
@@ -0,0 +1,16 @@
+<%--
+ Document : banner
+ Created on : Nov 5, 2013, 6:08:15 PM
+ Author : Alex O'Ree
+
+Hello World!
+
+If you want to really customize your juddi-gui instance, feel free to edit this file.
+You can use it to append html, javascript or whatever else you want onto every visible
+page of the juddi-gui.
+
+Often companies and government agencies need to insert banners, warnings or
+classification information on their web sites. This can be used to insert it
+painlessly. enjoy
+--%>
+
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org