Author: alexoree
Date: Sat Jun 1 02:07:29 2013
New Revision: 1488448
URL: http://svn.apache.org/r1488448
Log:
JUDDI JIRA-607 initial commit of the juddi admin console, working features
include, statistics, status (happy juddi). Adds a dependency for org.json
JUDDI JIRA-577, additional examples for encryption
Added:
juddi/trunk/juddi-examples/uddi-createbulk/src/uddi/createbulk/AES.java
juddi/trunk/juddi-examples/uddi-createbulk/src/uddi/createbulk/DES.java
juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/webconsole/
juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/webconsole/AES.java
- copied unchanged from r1486692,
juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/AES.java
juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/webconsole/CrossSiteRequestForgeryException.java
- copied unchanged from r1486692,
juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/CrossSiteRequestForgeryException.java
juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/webconsole/PostBackConstants.java
- copied unchanged from r1486692,
juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/PostBackConstants.java
juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/webconsole/StartupServlet.java
- copied unchanged from r1486692,
juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/StartupServlet.java
juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/webconsole/hub/
juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/webconsole/hub/UddiHub.java
- copied, changed from r1486692,
juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/UddiHub.java
juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/webconsole/hub/builders/
juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/webconsole/hub/builders/Builders.java
- copied, changed from r1486692,
juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/builders/Builders.java
juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/webconsole/hub/builders/Printers.java
- copied unchanged from r1486692,
juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/builders/Printers.java
juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/webconsole/hub/builders/SubscriptionHelper.java
- copied unchanged from r1486692,
juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/builders/SubscriptionHelper.java
juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/webconsole/resources/
juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/webconsole/resources/ResourceLoader.java
- copied unchanged from r1486692,
juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/resources/ResourceLoader.java
juddi/trunk/juddiv3-war/src/main/resources/
juddi/trunk/juddiv3-war/src/main/resources/META-INF/
juddi/trunk/juddiv3-war/src/main/resources/META-INF/uddi.xml
juddi/trunk/juddiv3-war/src/main/resources/org/
juddi/trunk/juddiv3-war/src/main/resources/org/apache/
juddi/trunk/juddiv3-war/src/main/resources/org/apache/juddi/
juddi/trunk/juddiv3-war/src/main/resources/org/apache/juddi/webconsole/
juddi/trunk/juddiv3-war/src/main/resources/org/apache/juddi/webconsole/resources/
juddi/trunk/juddiv3-war/src/main/resources/org/apache/juddi/webconsole/resources/web.properties
- copied unchanged from r1486692,
juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web.properties
juddi/trunk/juddiv3-war/src/main/resources/org/apache/juddi/webconsole/resources/web_es.properties
- copied unchanged from r1486692,
juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web_es.properties
juddi/trunk/juddiv3-war/src/main/webapp/admin/
juddi/trunk/juddiv3-war/src/main/webapp/admin/about.jsp
juddi/trunk/juddiv3-war/src/main/webapp/admin/ajax/
juddi/trunk/juddiv3-war/src/main/webapp/admin/csrf.jsp
juddi/trunk/juddiv3-war/src/main/webapp/admin/css/
juddi/trunk/juddiv3-war/src/main/webapp/admin/css/bootstrap-datetimepicker.min.css
juddi/trunk/juddiv3-war/src/main/webapp/admin/css/bootstrap-modal.css
juddi/trunk/juddiv3-war/src/main/webapp/admin/css/bootstrap-responsive.css
juddi/trunk/juddiv3-war/src/main/webapp/admin/css/bootstrap-responsive.min.css
juddi/trunk/juddiv3-war/src/main/webapp/admin/css/bootstrap-timepicker.min.css
juddi/trunk/juddiv3-war/src/main/webapp/admin/css/bootstrap.css
juddi/trunk/juddiv3-war/src/main/webapp/admin/css/bootstrap.min.css
juddi/trunk/juddiv3-war/src/main/webapp/admin/css/font-awesome-ie7.min.css
juddi/trunk/juddiv3-war/src/main/webapp/admin/css/font-awesome.css
juddi/trunk/juddiv3-war/src/main/webapp/admin/css/font-awesome.min.css
juddi/trunk/juddiv3-war/src/main/webapp/admin/css/ui-lightness/
juddi/trunk/juddiv3-war/src/main/webapp/admin/css/ui-lightness/images/
juddi/trunk/juddiv3-war/src/main/webapp/admin/css/ui-lightness/images/animated-overlay.gif
(with props)
juddi/trunk/juddiv3-war/src/main/webapp/admin/css/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png
(with props)
juddi/trunk/juddiv3-war/src/main/webapp/admin/css/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png
(with props)
juddi/trunk/juddiv3-war/src/main/webapp/admin/css/ui-lightness/images/ui-bg_flat_10_000000_40x100.png
(with props)
juddi/trunk/juddiv3-war/src/main/webapp/admin/css/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png
(with props)
juddi/trunk/juddiv3-war/src/main/webapp/admin/css/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png
(with props)
juddi/trunk/juddiv3-war/src/main/webapp/admin/css/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png
(with props)
juddi/trunk/juddiv3-war/src/main/webapp/admin/css/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png
(with props)
juddi/trunk/juddiv3-war/src/main/webapp/admin/css/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
(with props)
juddi/trunk/juddiv3-war/src/main/webapp/admin/css/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
(with props)
juddi/trunk/juddiv3-war/src/main/webapp/admin/css/ui-lightness/images/ui-icons_222222_256x240.png
(with props)
juddi/trunk/juddiv3-war/src/main/webapp/admin/css/ui-lightness/images/ui-icons_228ef1_256x240.png
(with props)
juddi/trunk/juddiv3-war/src/main/webapp/admin/css/ui-lightness/images/ui-icons_ef8c08_256x240.png
(with props)
juddi/trunk/juddiv3-war/src/main/webapp/admin/css/ui-lightness/images/ui-icons_ffd27a_256x240.png
(with props)
juddi/trunk/juddiv3-war/src/main/webapp/admin/css/ui-lightness/images/ui-icons_ffffff_256x240.png
(with props)
juddi/trunk/juddiv3-war/src/main/webapp/admin/css/ui-lightness/jquery-ui-1.10.1.custom.css
juddi/trunk/juddiv3-war/src/main/webapp/admin/css/ui-lightness/jquery-ui-1.10.1.custom.min.css
juddi/trunk/juddiv3-war/src/main/webapp/admin/css/ui-lightness/jquery-ui-1.10.2.custom.css
juddi/trunk/juddiv3-war/src/main/webapp/admin/css/ui-lightness/jquery-ui-1.10.2.custom.min.css
juddi/trunk/juddiv3-war/src/main/webapp/admin/error.jsp
juddi/trunk/juddiv3-war/src/main/webapp/admin/favicon.ico (with props)
juddi/trunk/juddiv3-war/src/main/webapp/admin/font/
juddi/trunk/juddiv3-war/src/main/webapp/admin/font/FontAwesome.otf (with
props)
juddi/trunk/juddiv3-war/src/main/webapp/admin/font/fontawesome-webfont.eot
(with props)
juddi/trunk/juddiv3-war/src/main/webapp/admin/font/fontawesome-webfont.svg
juddi/trunk/juddiv3-war/src/main/webapp/admin/font/fontawesome-webfont.ttf
(with props)
juddi/trunk/juddiv3-war/src/main/webapp/admin/font/fontawesome-webfont.woff
(with props)
juddi/trunk/juddiv3-war/src/main/webapp/admin/happy.jsp
juddi/trunk/juddiv3-war/src/main/webapp/admin/header-bottom.jsp
juddi/trunk/juddiv3-war/src/main/webapp/admin/header-top.jsp
juddi/trunk/juddiv3-war/src/main/webapp/admin/home.jsp
juddi/trunk/juddiv3-war/src/main/webapp/admin/img/
juddi/trunk/juddiv3-war/src/main/webapp/admin/img/ajax-loader.gif (with
props)
juddi/trunk/juddiv3-war/src/main/webapp/admin/img/bigrollergreen.gif
(with props)
juddi/trunk/juddiv3-war/src/main/webapp/admin/img/bluemarble2.jpg (with
props)
juddi/trunk/juddiv3-war/src/main/webapp/admin/img/glyphicons-halflings-white.png
(with props)
juddi/trunk/juddiv3-war/src/main/webapp/admin/img/glyphicons-halflings.png
(with props)
juddi/trunk/juddiv3-war/src/main/webapp/admin/img/juddi_logo_v2.png (with
props)
juddi/trunk/juddiv3-war/src/main/webapp/admin/img/logo.png (with props)
juddi/trunk/juddiv3-war/src/main/webapp/admin/img/logo2.png (with props)
juddi/trunk/juddiv3-war/src/main/webapp/admin/index.jsp
juddi/trunk/juddiv3-war/src/main/webapp/admin/js/
juddi/trunk/juddiv3-war/src/main/webapp/admin/js/bindingChooser.js
juddi/trunk/juddiv3-war/src/main/webapp/admin/js/bootstrap-datetimepicker.min.js
juddi/trunk/juddiv3-war/src/main/webapp/admin/js/bootstrap-modal.js
juddi/trunk/juddiv3-war/src/main/webapp/admin/js/bootstrap-modalmanager.js
juddi/trunk/juddiv3-war/src/main/webapp/admin/js/bootstrap-timepicker.min.js
juddi/trunk/juddiv3-war/src/main/webapp/admin/js/bootstrap.js
juddi/trunk/juddiv3-war/src/main/webapp/admin/js/bootstrap.min.js
juddi/trunk/juddiv3-war/src/main/webapp/admin/js/businessChooser.js
juddi/trunk/juddiv3-war/src/main/webapp/admin/js/businessEditor.js
juddi/trunk/juddiv3-war/src/main/webapp/admin/js/businesssearch.js
juddi/trunk/juddiv3-war/src/main/webapp/admin/js/i18n.js.jsp
juddi/trunk/juddiv3-war/src/main/webapp/admin/js/jquery-1.9.1.js
juddi/trunk/juddiv3-war/src/main/webapp/admin/js/jquery-ui-1.10.2.custom.min.js
juddi/trunk/juddiv3-war/src/main/webapp/admin/js/jquery.jeditable.js
juddi/trunk/juddiv3-war/src/main/webapp/admin/js/main.js
juddi/trunk/juddiv3-war/src/main/webapp/admin/js/serviceBrowse.js
juddi/trunk/juddiv3-war/src/main/webapp/admin/js/serviceChooser.js
juddi/trunk/juddiv3-war/src/main/webapp/admin/js/serviceEditor.js
juddi/trunk/juddiv3-war/src/main/webapp/admin/js/tmodelChooser.js
juddi/trunk/juddiv3-war/src/main/webapp/admin/js/tmodeledit.js
juddi/trunk/juddiv3-war/src/main/webapp/admin/js/tmodelsearch.js
juddi/trunk/juddiv3-war/src/main/webapp/admin/login.jsp
juddi/trunk/juddiv3-war/src/main/webapp/admin/logout.jsp
juddi/trunk/juddiv3-war/src/main/webapp/admin/mbeans.jsp
juddi/trunk/juddiv3-war/src/main/webapp/admin/stats.jsp
Removed:
juddi/trunk/juddiv3-war/src/main/webapp/happy.jsp
juddi/trunk/juddiv3-war/src/main/webapp/mbeans.jsp
Modified:
juddi/trunk/juddi-tomcat/pom.xml
juddi/trunk/juddiv3-war/pom.xml
juddi/trunk/juddiv3-war/src/main/webapp/index.jsp
Added: juddi/trunk/juddi-examples/uddi-createbulk/src/uddi/createbulk/AES.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/uddi-createbulk/src/uddi/createbulk/AES.java?rev=1488448&view=auto
==============================================================================
--- juddi/trunk/juddi-examples/uddi-createbulk/src/uddi/createbulk/AES.java
(added)
+++ juddi/trunk/juddi-examples/uddi-createbulk/src/uddi/createbulk/AES.java Sat
Jun 1 02:07:29 2013
@@ -0,0 +1,72 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package uddi.createbulk;
+
+import javax.crypto.KeyGenerator;
+import javax.crypto.SecretKey;
+
+/**
+ *
+ * @author Alex O'Ree
+ */
+public class AES {
+
+ public static String GEN(int keysize) {
+ KeyGenerator kgen;
+ try {
+ kgen = KeyGenerator.getInstance("AES");
+ kgen.init(keysize);
+ SecretKey skey = kgen.generateKey();
+ byte[] raw = skey.getEncoded();
+ return asHex(raw);
+ } catch (Exception ex) {
+
+ }
+ return null;
+ }
+
+ private static String asHex(byte buf[]) {
+ //return new String(buf);
+ StringBuilder strbuf = new StringBuilder(buf.length * 2);
+ int i;
+
+ for (i = 0; i < buf.length; i++) {
+ if (((int) buf[i] & 0xff) < 0x10) {
+ strbuf.append("0");
+ }
+ strbuf.append(Long.toString((int) buf[i] & 0xff, 16));
+ }
+
+ return strbuf.toString();
+ }
+
+ private static byte[] hexToBytes(String s) {
+ //return s.getBytes();
+ return hexToBytes(s.toCharArray());
+ }
+ private static final char[] kDigits = {'0', '1', '2', '3', '4', '5', '6',
'7', '8', '9', 'a',
+ 'b', 'c', 'd', 'e', 'f'};
+
+ private static byte[] hexToBytes(char[] hex) {
+ int length = hex.length / 2;
+ byte[] raw = new byte[length];
+ for (int i = 0; i < length; i++) {
+ int high = Character.digit(hex[i * 2], 16);
+ int low = Character.digit(hex[i * 2 + 1], 16);
+ int value = (high << 4) | low;
+ if (value > 127) {
+ value -= 256;
+ }
+ raw[i] = (byte) value;
+ }
+ return raw;
+ }
+ //default key
+ private final static String something2 =
"dde284c781d60ca0b56c4b23eec85217951dc99869402abd42c7dcc9080d60aa";
+
+ public static void main(String[] args){
+ System.out.println(GEN(128));
+ }
+}
Added: juddi/trunk/juddi-examples/uddi-createbulk/src/uddi/createbulk/DES.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/uddi-createbulk/src/uddi/createbulk/DES.java?rev=1488448&view=auto
==============================================================================
--- juddi/trunk/juddi-examples/uddi-createbulk/src/uddi/createbulk/DES.java
(added)
+++ juddi/trunk/juddi-examples/uddi-createbulk/src/uddi/createbulk/DES.java Sat
Jun 1 02:07:29 2013
@@ -0,0 +1,75 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package uddi.createbulk;
+
+import java.security.InvalidAlgorithmParameterException;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+import java.security.spec.KeySpec;
+import javax.crypto.BadPaddingException;
+import javax.crypto.Cipher;
+import javax.crypto.IllegalBlockSizeException;
+import javax.crypto.KeyGenerator;
+import javax.crypto.NoSuchPaddingException;
+import javax.crypto.SecretKey;
+import javax.crypto.SecretKeyFactory;
+import javax.crypto.spec.DESedeKeySpec;
+import org.apache.commons.codec.binary.Base64;
+
+/**
+ *
+ * @author Alex O'Ree
+ */
+public class DES {
+ private static final String UNICODE_FORMAT = "UTF8";
+ public static final String DESEDE_ENCRYPTION_SCHEME = "DESede";
+ private KeySpec ks;
+ private SecretKeyFactory skf;
+ private Cipher cipher;
+ byte[] arrayBytes;
+ private String myEncryptionKey;
+ private String myEncryptionScheme;
+ SecretKey key;
+
+ public DES() throws Exception {
+ myEncryptionKey = "rioTEBCe/RAHRs6tTyYxDqettnVbZA6z";
+ myEncryptionScheme = DESEDE_ENCRYPTION_SCHEME;
+ arrayBytes = myEncryptionKey.getBytes(UNICODE_FORMAT);
+ ks = new DESedeKeySpec(arrayBytes);
+ skf = SecretKeyFactory.getInstance(myEncryptionScheme);
+ cipher = Cipher.getInstance(myEncryptionScheme);
+ key = skf.generateSecret(ks);
+ }
+
+
+ public String encrypt(String clear) throws NoSuchPaddingException,
NoSuchAlgorithmException, InvalidAlgorithmParameterException,
InvalidKeyException, IllegalBlockSizeException, BadPaddingException {
+ String encryptedString = null;
+ try {
+ cipher.init(Cipher.ENCRYPT_MODE, key);
+ byte[] plainText = clear.getBytes(UNICODE_FORMAT);
+ byte[] encryptedText = cipher.doFinal(plainText);
+ encryptedString = new String(Base64.encodeBase64(encryptedText));
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return encryptedString;
+ }
+
+ public static void main(String[] args) throws Exception{
+ DES des = new DES();
+ /*KeyGenerator kgen;
+ try {
+ kgen = KeyGenerator.getInstance(DESEDE_ENCRYPTION_SCHEME);
+ kgen.init(168);
+ SecretKey skey = kgen.generateKey();
+ byte[] raw = skey.getEncoded();
+ System.out.println(new String(Base64.encodeBase64(raw)));
+ } catch (Exception ex) {
+ ex.printStackTrace();;
+ }*/
+ System.out.println(des.encrypt("test"));
+ }
+}
Modified: juddi/trunk/juddi-tomcat/pom.xml
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-tomcat/pom.xml?rev=1488448&r1=1488447&r2=1488448&view=diff
==============================================================================
--- juddi/trunk/juddi-tomcat/pom.xml (original)
+++ juddi/trunk/juddi-tomcat/pom.xml Sat Jun 1 02:07:29 2013
@@ -75,6 +75,12 @@
<artifactId>log4j</artifactId>
<version>1.2.13</version>
</dependency>
+<dependency>
+ <groupId>org.json</groupId>
+ <artifactId>json</artifactId>
+ <version>20090211</version>
+</dependency>
+
</dependencies>
<build>
<plugins>
Modified: juddi/trunk/juddiv3-war/pom.xml
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddiv3-war/pom.xml?rev=1488448&r1=1488447&r2=1488448&view=diff
==============================================================================
--- juddi/trunk/juddiv3-war/pom.xml (original)
+++ juddi/trunk/juddiv3-war/pom.xml Sat Jun 1 02:07:29 2013
@@ -42,6 +42,12 @@
<artifactId>commons-configuration</artifactId>
<version>1.6</version>
</dependency>
+ <dependency>
+ <groupId>org.json</groupId>
+ <artifactId>json</artifactId>
+ <version>20090211</version>
+</dependency>
+
</dependencies>
<build>
<finalName>juddiv3</finalName>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
