August 2010 - jbosstools-commits - Jboss List Archives

JBoss Tools SVN: r24055 - trunk/usage/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test.

by jbosstools-commits＠lists.jboss.org

Author: adietish Date: 2010-08-11 11:09:08 -0400 (Wed, 11 Aug 2010) New Revision: 24055 Modified: trunk/usage/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageRequestsTest.java Log: / replaced by %2F Modified: trunk/usage/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageRequestsTest.java =================================================================== --- trunk/usage/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageRequestsTest.java 2010-08-11 14:58:40 UTC (rev 24054) +++ trunk/usage/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageRequestsTest.java 2010-08-11 15:09:08 UTC (rev 24055) @@ -29,7 +29,7 @@ +"&utmdt=-%20JBoss%20Community" +"&utmhid=1087431432" +"&utmr=0" - +"&utmp=%2Ftools%2Fusage//testUrl0" + +"&utmp=%2Ftools%2Fusage%2FtestUrl0" +"&utmac=UA-17645367-1" +"&utmcc=__utma%3D156030507.1285760711.1281430767.1281430767.1281430767.1%3B%2B__utmz%3D156030500.1281430767.1.1.utmcsr%3D(direct)%7Cutmccn%3D(direct)%7Cutmcmd%3D(none)%3B" +"&gaq=1"; @@ -54,7 +54,7 @@ +"&utmdt=-%20JBoss%20Community" +"&utmhid=1087431432" +"&utmr=0" - +"&utmp=%2Ftools%2Fusage//testUrl0_0" + +"&utmp=%2Ftools%2Fusage%2FtestUrl0_0" +"&utmac=UA-17645367-1" +"&utmcc=__utma%3D156032507.1285760711.1281430767.1281430767.1281430767.1%3B%2B__utmz%3D156030500.1281430767.1.1.utmcsr%3D(direct)%7Cutmccn%3D(direct)%7Cutmcmd%3D(none)%3B" +"&gaq=1"; @@ -79,7 +79,7 @@ +"&utmdt=-%20JBoss%20Community" +"&utmhid=1087431432" +"&utmr=0" - +"&utmp=%2Ftools%2Fusage/testUrl0_1" + +"&utmp=%2Ftools%2Fusage%2FtestUrl0_1" +"&utmac=UA-17645367-1" +"&__utma%3D156030508.195542053.1281528584.1281528584.1281528584.1%3B%2B__utmz%3D156030500.1281528584.1.1.utmcsr%3D(direct)%7Cutmccn%3D(direct)%7Cutmcmd%3D(none)%3B" +"&gaq=1"; @@ -104,7 +104,7 @@ +"&utmdt=-%20JBoss%20Community" +"&utmhid=1087431432" +"&utmr=0" - +"&utmp=%2Ftools%2Fusage/testUrl0_2" + +"&utmp=%2Ftools%2Fusage%2FtestUrl0_2" +"&utmac=UA-17645367-1" +"&utmcc=__utma%3D156030509.1285760712.1281430767.1281430767.1281430767.1%3B%2B__utmz%3D156030500.1281430767.1.1.utmcsr%3D(direct)%7Cutmccn%3D(direct)%7Cutmcmd%3D(none)%3B" +"&gaq=1"; @@ -129,7 +129,7 @@ +"&utmdt=-%20JBoss%20Community" +"&utmhid=1087431432" +"&utmr=0" - +"&utmp=%2Ftools%2Fusage/testUrl0_3" + +"&utmp=%2Ftools%2Fusage%2FtestUrl0_3" +"&utmac=UA-17645367-1" +"&utmcc=__utma%3D156030501.1285760711.1281430767.1281430767.1281430767.1%3B%2B__utmz%3D156030500.1281430767.1.1.utmcsr%3D(direct)%7Cutmccn%3D(direct)%7Cutmcmd%3D(none)%3B" +"&gaq=1"; @@ -154,7 +154,7 @@ +"&utmdt=-%20JBoss%20Community" +"&utmhid=1087431432" +"&utmr=0" - +"&utmp=%2Ftools%2Fusage/testUrl0_4" + +"&utmp=%2Ftools%2Fusage%2FtestUrl0_4" +"&utmac=UA-17645367-1" +"&__utma%3D156030502.195542053.1281528584.1281528584.1281528584.1%3B%2B__utmz%3D156030500.1281528584.1.1.utmcsr%3D(direct)%7Cutmccn%3D(direct)%7Cutmcmd%3D(none)%3B" +"&gaq=1"; @@ -179,7 +179,7 @@ +"&utmdt=-%20JBoss%20Community" +"&utmhid=1087431432" +"&utmr=0" - +"&utmp=%2Ftools%2Fusage/testUrl0_5" + +"&utmp=%2Ftools%2Fusage%2FtestUrl0_5" +"&utmac=UA-17645367-1" +"&__utma%3D156030503.195542053.1281528584.1281528584.1281528584.1%3B%2B__utmz%3D156030500.1281528584.1.1.utmcsr%3D(direct)%7Cutmccn%3D(direct)%7Cutmcmd%3D(none)%3B" +"&gaq=1"; @@ -204,7 +204,7 @@ +"&utmdt=-%20JBoss%20Community" +"&utmhid=1087431432" +"&utmr=0" - +"&utmp=%2Ftools%2Fusage//testUrl0_6" + +"&utmp=%2Ftools%2Fusage%2FtestUrl0_6" +"&utmac=UA-17645367-1" +"&utmcc=__utma%3D156030507.1285760711.1281430767.1281430767.1281430767.1%3B%2B__utmz%3D156030500.1281430767.1.1.utmcsr%3D(direct)%7Cutmccn%3D(direct)%7Cutmcmd%3D(none)%3B" +"&gaq=1"; @@ -229,7 +229,7 @@ +"&utmdt=-%20JBoss%20Community" +"&utmhid=1087431432" +"&utmr=0" - +"&utmp=%2Ftools%2Fusage//testUrl0_7" + +"&utmp=%2Ftools%2Fusage%2FtestUrl0_7" +"&utmac=UA-17645367-1" +"&utmcc=__utma%3D156030507.1285760711.1281430767.1281430767.1281430767.1%3B%2B__utmz%3D156030500.1281430767.1.1.utmcsr%3D(direct)%7Cutmccn%3D(direct)%7Cutmcmd%3D(none)%3B" +"&gaq=1";

15 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r24054 - trunk/usage/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test.

by jbosstools-commits＠lists.jboss.org

Author: adietish Date: 2010-08-11 10:58:40 -0400 (Wed, 11 Aug 2010) New Revision: 24054 Modified: trunk/usage/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageRequestsTest.java Log: extensive url tests, slight refactorings in the code base Modified: trunk/usage/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageRequestsTest.java =================================================================== --- trunk/usage/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageRequestsTest.java 2010-08-11 14:54:45 UTC (rev 24053) +++ trunk/usage/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageRequestsTest.java 2010-08-11 14:58:40 UTC (rev 24054) @@ -43,7 +43,7 @@ TestHttpGetMethod method = new TestHttpGetMethod(userAgent); String url = "http://www.google-analytics.com/__utm.gif?" +"utmwv=4.7.2" - +"&utmn=338321265" + +"&utmn=338321288" +"&utmhn=jboss.org" +"&utmcs=UTF-8" +"&utmsr=1920x1080" @@ -56,7 +56,7 @@ +"&utmr=0" +"&utmp=%2Ftools%2Fusage//testUrl0_0" +"&utmac=UA-17645367-1" - +"&utmcc=__utma%3D156030507.1285760711.1281430767.1281430767.1281430767.1%3B%2B__utmz%3D156030500.1281430767.1.1.utmcsr%3D(direct)%7Cutmccn%3D(direct)%7Cutmcmd%3D(none)%3B" + +"&utmcc=__utma%3D156032507.1285760711.1281430767.1281430767.1281430767.1%3B%2B__utmz%3D156030500.1281430767.1.1.utmcsr%3D(direct)%7Cutmccn%3D(direct)%7Cutmcmd%3D(none)%3B" +"&gaq=1"; method.request(url); assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());

15 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r24053 - trunk/usage/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test.

by jbosstools-commits＠lists.jboss.org

Author: adietish Date: 2010-08-11 10:54:45 -0400 (Wed, 11 Aug 2010) New Revision: 24053 Modified: trunk/usage/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageRequestsTest.java trunk/usage/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageTest.java Log: extensive url tests, slight refactorings in the code base Modified: trunk/usage/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageRequestsTest.java =================================================================== --- trunk/usage/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageRequestsTest.java 2010-08-11 14:54:08 UTC (rev 24052) +++ trunk/usage/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageRequestsTest.java 2010-08-11 14:54:45 UTC (rev 24053) @@ -13,96 +13,300 @@ private static final String GOOGLE_ANALYTICS_TRACKING_URL = "http://www.google-analytics.com/__utm.gif"; @Test - public void testUrl1() throws IOException { - String userAgent = "com.jboss.jbds.product/3.5.0 (gtk; U; linux x86; en_US) v20090525 Eclipse/3.5.0.v20090525"; + public void testUrl0() throws IOException { + String userAgent = "Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.4) Gecko/20100614 Ubuntu/10.04 (lucid) Firefox/10.0.0"; TestHttpGetMethod method = new TestHttpGetMethod(userAgent); - String url = GOOGLE_ANALYTICS_TRACKING_URL - + "?" - +"utmwv=1" - + "&utmn=2016784548" - + "&utmcs=UTF-8" - + "&utmsc=24-bit" - + "&utmsr=1920x1080" - + "&utmul=en_US" - + "&utmcr=1" - + "&utmdt=jboss.org-tools-usage-action-wsstartup-test-" - + "&utmhn=localhost" - + "&utmr=org.jboss.tools.usage.tests" - + "&utmp=/jboss.org/tools/usage/action/wsstartup/testUrl1" - + "&utmac=UA-17645367-1" - + "&utmcc=__utma%3D'2131379572.1097452543.1280502756059.1280502756059.1280502756059.2%3B%2B__utmb%3D649997112%3B%2B__utmc%3D2002669685%3B%2B__utmz%3D1137436918.1280502756059"; + String url = "http://www.google-analytics.com/__utm.gif?" + +"utmwv=4.7.2" + +"&utmn=338321265" + +"&utmhn=jboss.org" + +"&utmcs=UTF-8" + +"&utmsr=1920x1080" + +"&utmsc=24-bit" + +"&utmul=en-us" + +"&utmje=1" + +"&utmfl=10.1%20r53" + +"&utmdt=-%20JBoss%20Community" + +"&utmhid=1087431432" + +"&utmr=0" + +"&utmp=%2Ftools%2Fusage//testUrl0" + +"&utmac=UA-17645367-1" + +"&utmcc=__utma%3D156030507.1285760711.1281430767.1281430767.1281430767.1%3B%2B__utmz%3D156030500.1281430767.1.1.utmcsr%3D(direct)%7Cutmccn%3D(direct)%7Cutmcmd%3D(none)%3B" + +"&gaq=1"; + method.request(url); + assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode()); + } + + @Test + public void testUrl0_0() throws IOException { + String userAgent = "com.jboss.jbds.product/3.0.1 (X11; U; Linux x86_64; en-US)"; + TestHttpGetMethod method = new TestHttpGetMethod(userAgent); + String url = "http://www.google-analytics.com/__utm.gif?" + +"utmwv=4.7.2" + +"&utmn=338321265" + +"&utmhn=jboss.org" + +"&utmcs=UTF-8" + +"&utmsr=1920x1080" + +"&utmsc=24-bit" + +"&utmul=en-us" + +"&utmje=1" + +"&utmfl=10.1%20r53" + +"&utmdt=-%20JBoss%20Community" + +"&utmhid=1087431432" + +"&utmr=0" + +"&utmp=%2Ftools%2Fusage//testUrl0_0" + +"&utmac=UA-17645367-1" + +"&utmcc=__utma%3D156030507.1285760711.1281430767.1281430767.1281430767.1%3B%2B__utmz%3D156030500.1281430767.1.1.utmcsr%3D(direct)%7Cutmccn%3D(direct)%7Cutmcmd%3D(none)%3B" + +"&gaq=1"; + method.request(url); + assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode()); + } + @Test + public void testUrl0_1() throws IOException { + String userAgent = "com.jboss.jbds.product/3.0.1 (X11; U; Linux x86_64; en-US; rv:1.9.2.4) Gecko/20100614 Ubuntu/10.04 (lucid) v201006010437R-H98-GA"; + TestHttpGetMethod method = new TestHttpGetMethod(userAgent); + String url = "http://www.google-analytics.com/__utm.gif?" + +"utmwv=4.7.2" + +"&utmn=3383212651" + +"&utmhn=jboss.org" + +"&utmcs=UTF-8" + +"&utmsr=1920x1080" + +"&utmsc=24-bit" + +"&utmul=en-us" + +"&utmje=1" + +"&utmfl=10.1%20r53" + +"&utmdt=-%20JBoss%20Community" + +"&utmhid=1087431432" + +"&utmr=0" + +"&utmp=%2Ftools%2Fusage/testUrl0_1" + +"&utmac=UA-17645367-1" + +"&__utma%3D156030508.195542053.1281528584.1281528584.1281528584.1%3B%2B__utmz%3D156030500.1281528584.1.1.utmcsr%3D(direct)%7Cutmccn%3D(direct)%7Cutmcmd%3D(none)%3B" + +"&gaq=1"; method.request(url); assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode()); } @Test - public void testUrl1_Session2() throws IOException { - String userAgent = "com.jboss.jbds.product/3.0.1 (gtk; U; linux x86; en_US) v20090525 Eclipse/3.5.0.v20090525"; + public void testUrl0_2() throws IOException { + String userAgent = "com.jboss.jbds.product/3.0.1 (X11; U; Linux x86_64; en-US; rv:1.9.2.4) Gecko/20100614 Ubuntu/10.04 (lucid) Eclipse/3.5.0"; TestHttpGetMethod method = new TestHttpGetMethod(userAgent); - String url = GOOGLE_ANALYTICS_TRACKING_URL - + "?" - +"utmwv=1" - + "&utmn=2016784548" - + "&utmcs=UTF-8" - + "&utmsc=24-bit" - + "&utmsr=1920x1080" - + "&utmul=en_US" - + "&utmcr=1" - + "&utmdt=jboss.org-tools-usage-action-wsstartup-test-" - + "&utmhn=localhost" - + "&utmr=org.jboss.tools.usage.tests" - + "&utmp=/jboss.org/tools/usage/action/wsstartup/testUrl1_Session2" - + "&utmac=UA-17645367-1" - + "&utmcc=__utma%3D'2131379572.1097452543.1280502756059.1280502756059.1280502756059.2%3B%2B__utmb%3D649997112%3B%2B__utmc%3D2002669685%3B%2B__utmz%3D1137436918.1280502756059"; + String url = "http://www.google-analytics.com/__utm.gif?" + +"utmwv=4.7.2" + +"&utmn=3383212652" + +"&utmhn=jboss.org" + +"&utmcs=UTF-8" + +"&utmsr=1920x1080" + +"&utmsc=24-bit" + +"&utmul=en-us" + +"&utmje=1" + +"&utmfl=10.1%20r53" + +"&utmdt=-%20JBoss%20Community" + +"&utmhid=1087431432" + +"&utmr=0" + +"&utmp=%2Ftools%2Fusage/testUrl0_2" + +"&utmac=UA-17645367-1" + +"&utmcc=__utma%3D156030509.1285760712.1281430767.1281430767.1281430767.1%3B%2B__utmz%3D156030500.1281430767.1.1.utmcsr%3D(direct)%7Cutmccn%3D(direct)%7Cutmcmd%3D(none)%3B" + +"&gaq=1"; + method.request(url); + assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode()); + } + @Test + public void testUrl0_3() throws IOException { + String userAgent = "com.jboss.jbds.product/3.0.1 (X11; U; Linux x86_64; en-US;) Eclipse/3.5.0"; + TestHttpGetMethod method = new TestHttpGetMethod(userAgent); + String url = "http://www.google-analytics.com/__utm.gif?" + +"utmwv=4.7.2" + +"&utmn=3383212651" + +"&utmhn=jboss.org" + +"&utmcs=UTF-8" + +"&utmsr=1920x1080" + +"&utmsc=24-bit" + +"&utmul=en-us" + +"&utmje=1" + +"&utmfl=10.1%20r53" + +"&utmdt=-%20JBoss%20Community" + +"&utmhid=1087431432" + +"&utmr=0" + +"&utmp=%2Ftools%2Fusage/testUrl0_3" + +"&utmac=UA-17645367-1" + +"&utmcc=__utma%3D156030501.1285760711.1281430767.1281430767.1281430767.1%3B%2B__utmz%3D156030500.1281430767.1.1.utmcsr%3D(direct)%7Cutmccn%3D(direct)%7Cutmcmd%3D(none)%3B" + +"&gaq=1"; method.request(url); assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode()); } + + @Test + public void testUrl0_4() throws IOException { + String userAgent = "com.jboss.jbds.product/3.0.1"; + TestHttpGetMethod method = new TestHttpGetMethod(userAgent); + String url = "http://www.google-analytics.com/__utm.gif?" + +"utmwv=4.7.2" + +"&utmn=3383212651" + +"&utmhn=jboss.org" + +"&utmcs=UTF-8" + +"&utmsr=1920x1080" + +"&utmsc=24-bit" + +"&utmul=en-us" + +"&utmje=1" + +"&utmfl=10.1%20r53" + +"&utmdt=-%20JBoss%20Community" + +"&utmhid=1087431432" + +"&utmr=0" + +"&utmp=%2Ftools%2Fusage/testUrl0_4" + +"&utmac=UA-17645367-1" + +"&__utma%3D156030502.195542053.1281528584.1281528584.1281528584.1%3B%2B__utmz%3D156030500.1281528584.1.1.utmcsr%3D(direct)%7Cutmccn%3D(direct)%7Cutmcmd%3D(none)%3B" + +"&gaq=1"; + method.request(url); + assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode()); + } @Test + public void testUrl0_5() throws IOException { + String userAgent = "com.jboss.jbds.product/3.0.1 (Linux x86_64)"; + TestHttpGetMethod method = new TestHttpGetMethod(userAgent); + String url = "http://www.google-analytics.com/__utm.gif?" + +"utmwv=4.7.2" + +"&utmn=33832126513" + +"&utmhn=jboss.org" + +"&utmcs=UTF-8" + +"&utmsr=1920x1080" + +"&utmsc=24-bit" + +"&utmul=en-us" + +"&utmje=1" + +"&utmfl=10.1%20r53" + +"&utmdt=-%20JBoss%20Community" + +"&utmhid=1087431432" + +"&utmr=0" + +"&utmp=%2Ftools%2Fusage/testUrl0_5" + +"&utmac=UA-17645367-1" + +"&__utma%3D156030503.195542053.1281528584.1281528584.1281528584.1%3B%2B__utmz%3D156030500.1281528584.1.1.utmcsr%3D(direct)%7Cutmccn%3D(direct)%7Cutmcmd%3D(none)%3B" + +"&gaq=1"; + method.request(url); + assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode()); + } + + @Test + public void testUrl0_6() throws IOException { + String userAgent = "Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.4) Gecko/20100614 Ubuntu/10.04 (lucid) com.jboss.jbds.product/3.0.1"; + TestHttpGetMethod method = new TestHttpGetMethod(userAgent); + String url = "http://www.google-analytics.com/__utm.gif?" + +"utmwv=4.7.2" + +"&utmn=338321265" + +"&utmhn=jboss.org" + +"&utmcs=UTF-8" + +"&utmsr=1920x1080" + +"&utmsc=24-bit" + +"&utmul=en-us" + +"&utmje=1" + +"&utmfl=10.1%20r53" + +"&utmdt=-%20JBoss%20Community" + +"&utmhid=1087431432" + +"&utmr=0" + +"&utmp=%2Ftools%2Fusage//testUrl0_6" + +"&utmac=UA-17645367-1" + +"&utmcc=__utma%3D156030507.1285760711.1281430767.1281430767.1281430767.1%3B%2B__utmz%3D156030500.1281430767.1.1.utmcsr%3D(direct)%7Cutmccn%3D(direct)%7Cutmcmd%3D(none)%3B" + +"&gaq=1"; + method.request(url); + assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode()); + } + + @Test + public void testUrl0_7() throws IOException { + String userAgent = "com.jboss.jbds.product/3.0.1 (X11; U; Linux x86_64; en-US)"; + TestHttpGetMethod method = new TestHttpGetMethod(userAgent); + String url = "http://www.google-analytics.com/__utm.gif?" + +"utmwv=4.7.2" + +"&utmn=338321268" + +"&utmhn=jboss.org" + +"&utmcs=UTF-8" + +"&utmsr=1920x1080" + +"&utmsc=24-bit" + +"&utmul=en-us" + +"&utmje=1" + +"&utmfl=10.1%20r53" + +"&utmdt=-%20JBoss%20Community" + +"&utmhid=1087431432" + +"&utmr=0" + +"&utmp=%2Ftools%2Fusage//testUrl0_7" + +"&utmac=UA-17645367-1" + +"&utmcc=__utma%3D156030507.1285760711.1281430767.1281430767.1281430767.1%3B%2B__utmz%3D156030500.1281430767.1.1.utmcsr%3D(direct)%7Cutmccn%3D(direct)%7Cutmcmd%3D(none)%3B" + +"&gaq=1"; + method.request(url); + assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode()); + } + + @Test + public void testUrl1() throws IOException { + String userAgent = "JBossToolsUsageRequestsTest/1.0.0"; + TestHttpGetMethod method = new TestHttpGetMethod(userAgent); + String url = GOOGLE_ANALYTICS_TRACKING_URL + +"?" + +"utmwv=4.7.2" + +"utmn=338321266" + +"utmhn=jboss.org" + +"utmcs=UTF-8" + +"utmsr=1920x1080" + +"utmsc=24-bit" + +"utmul=en-us" + +"utmje=1" + +"utmfl=10.1%20r53" + +"utmdt=-%20JBoss%20Community" + +"utmhid=1087431432" + +"utmr=0" + +"utmp=%2Ftools%2Fusage/testUrl1" + +"utmac=UA-17645367-1" + +"utmcc=__utma%3D156030500.1285760711.1281430767.1281430767.1281430767.1%3B%2B__utmz%3D156030500.1281430767.1.1.utmcsr%3D(direct)%7Cutmccn%3D(direct)%7Cutmcmd%3D(none)%3B" + +"gaq=1"; + method.request(url); + assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode()); + } + + @Test public void testUrl2() throws IOException { - String userAgent = "com.jboss.jbds.product/3.0.1 (X11; U; linux x86; en_US) v20090525 Eclipse/3.5.0.v20090525"; + String userAgent = "JBossToolsUsageRequestsTest/1.0.0"; TestHttpGetMethod method = new TestHttpGetMethod(userAgent); String url = GOOGLE_ANALYTICS_TRACKING_URL - + "?" - +"utmwv=1" - + "&utmn=2016784548" - + "&utmcs=UTF-8" - + "&utmsc=24-bit" - + "&utmsr=1920x1080" - + "&utmul=en_US" - + "&utmcr=1" - + "&utmdt=jboss.org-tools-usage-action-wsstartup-test-" - + "&utmhn=localhost" - + "&utmr=org.jboss.tools.usage.tests" - + "&utmp=/jboss.org/tools/usage/action/wsstartup/testUrl2" - + "&utmac=UA-17645367-1" - + "&utmcc=__utma%3D'2131379572.1097452543.1280502756059.1280502756059.1280502756059.2%3B%2B__utmb%3D649997112%3B%2B__utmc%3D2002669685%3B%2B__utmz%3D1137436918.1280502756059"; + +"?" + +"utmwv=4.7.2" + +"utmn=338321267" + +"utmhn=jboss.org" + +"utmcs=UTF-8" + +"utmsr=1920x1080" + +"utmsc=24-bit" + +"utmul=en-us" + +"utmdt=-%20JBoss%20Community" + +"utmhid=1087431432" + +"utmr=0" + +"utmp=%2Ftools%2Fusage/testUrl2" + +"utmac=UA-17645367-1" + +"utmcc=__utma%3D156030500.1285760711.1281430767.1281430767.1281430767.1%3B%2B__utmz%3D156030500.1281430767.1.1.utmcsr%3D(direct)%7Cutmccn%3D(direct)%7Cutmcmd%3D(none)%3B" + +"gaq=1"; method.request(url); assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode()); } @Test public void testUrl3() throws IOException { - String userAgent = "com.jboss.jbds.product/3.0.1 (X11; linux x86; en_US) v20090525 Eclipse/3.5.0"; + String userAgent = "JBossToolsUsageRequestsTest/1.0.0"; TestHttpGetMethod method = new TestHttpGetMethod(userAgent); String url = GOOGLE_ANALYTICS_TRACKING_URL - + "?" - +"utmwv=1" - + "&utmn=2016784548" - + "&utmcs=UTF-8" - + "&utmsc=24-bit" - + "&utmsr=1920x1080" - + "&utmul=en_US" - + "&utmcr=1" - + "&utmdt=jboss.org-tools-usage-action-wsstartup-test-" - + "&utmhn=localhost" - + "&utmr=org.jboss.tools.usage.tests" - + "&utmp=/jboss.org/tools/usage/action/wsstartup/testUrl3" - + "&utmac=UA-17645367-1" - + "&utmcc=__utma%3D'2131379572.1097452543.1280502756059.1280502756059.1280502756059.2%3B%2B__utmb%3D649997112%3B%2B__utmc%3D2002669685%3B%2B__utmz%3D1137436918.1280502756059"; - + +"?" + +"utmwv=4.7.2" + +"utmn=338321268" + +"utmhn=jboss.org" + +"utmcs=UTF-8" + +"utmsr=1920x1080" + +"utmsc=24-bit" + +"utmul=en-us" + +"utmdt=-%20JBoss%20Community" + +"utmhid=1087431432" + +"utmr=0" + +"utmp=%2Ftools%2Fusage/testUrl3" + +"utmac=UA-17645367-1" + +"utmcc=__utma%3D156030500.1285760711.1281430767.1281430767.1281430767.1%3B%2B__utmz%3D156030500.1281430767.1.1.utmcsr%3D(direct)%7Cutmccn%3D(direct)%7Cutmcmd%3D(none)%3B" + +"gaq=1"; method.request(url); assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode()); } @@ -111,7 +315,6 @@ private HttpURLConnection urlConnection; - public TestHttpGetMethod(String userAgent) { super(userAgent); } @@ -124,8 +327,7 @@ } public int getResponseCode() throws IOException { - return super.getResponseCode(urlConnection); + return urlConnection.getResponseCode(); } } - } Modified: trunk/usage/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageTest.java =================================================================== --- trunk/usage/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageTest.java 2010-08-11 14:54:08 UTC (rev 24052) +++ trunk/usage/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageTest.java 2010-08-11 14:54:45 UTC (rev 24053) @@ -26,7 +26,7 @@ .setChild(new FocusPoint("usage") .setChild(new FocusPoint("action") .setChild(new FocusPoint("wsstartup") - .setChild(new FocusPoint("test")))))); + .setChild(new FocusPoint("testversion472")))))); private static final String GANALYTICS_TRACKINGCODE = "UA-17645367-1";

15 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r24052 - in trunk/usage/org.jboss.tools.usage: src/org/jboss/tools/usage/jgoogleanalytics and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: adietish Date: 2010-08-11 10:54:08 -0400 (Wed, 11 Aug 2010) New Revision: 24052 Added: trunk/usage/org.jboss.tools.usage/src/org/jboss/tools/usage/jgoogleanalytics/GoogleAnalyticsUrlStrategy.java Removed: trunk/usage/org.jboss.tools.usage/bin/org/jboss/tools/usage/jgoogleanalytics/GoogleAnalyticsURLStrategy.class trunk/usage/org.jboss.tools.usage/src/org/jboss/tools/usage/jgoogleanalytics/GoogleAnalyticsURLStrategy.java Modified: trunk/usage/org.jboss.tools.usage/src/org/jboss/tools/usage/jgoogleanalytics/EclipseEnvironment.java trunk/usage/org.jboss.tools.usage/src/org/jboss/tools/usage/jgoogleanalytics/HttpGetMethod.java trunk/usage/org.jboss.tools.usage/src/org/jboss/tools/usage/jgoogleanalytics/IGoogleAnalyticsParameters.java trunk/usage/org.jboss.tools.usage/src/org/jboss/tools/usage/jgoogleanalytics/JGoogleAnalyticsTracker.java Log: extensive url tests, slight refactorings in the code base Deleted: trunk/usage/org.jboss.tools.usage/bin/org/jboss/tools/usage/jgoogleanalytics/GoogleAnalyticsURLStrategy.class =================================================================== (Binary files differ) Modified: trunk/usage/org.jboss.tools.usage/src/org/jboss/tools/usage/jgoogleanalytics/EclipseEnvironment.java =================================================================== --- trunk/usage/org.jboss.tools.usage/src/org/jboss/tools/usage/jgoogleanalytics/EclipseEnvironment.java 2010-08-11 14:50:06 UTC (rev 24051) +++ trunk/usage/org.jboss.tools.usage/src/org/jboss/tools/usage/jgoogleanalytics/EclipseEnvironment.java 2010-08-11 14:54:08 UTC (rev 24052) @@ -143,7 +143,7 @@ // , browserLanguage // , buildId // , eclipseVersion); - return "EclipseEnvironment/.0.2"; + return "EclipseEnvironment/3.0.1"; } private String getEclipseVersion() { Deleted: trunk/usage/org.jboss.tools.usage/src/org/jboss/tools/usage/jgoogleanalytics/GoogleAnalyticsURLStrategy.java =================================================================== --- trunk/usage/org.jboss.tools.usage/src/org/jboss/tools/usage/jgoogleanalytics/GoogleAnalyticsURLStrategy.java 2010-08-11 14:50:06 UTC (rev 24051) +++ trunk/usage/org.jboss.tools.usage/src/org/jboss/tools/usage/jgoogleanalytics/GoogleAnalyticsURLStrategy.java 2010-08-11 14:54:08 UTC (rev 24052) @@ -1,217 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2008 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.usage.jgoogleanalytics; - -import java.io.UnsupportedEncodingException; - -import org.jboss.tools.usage.util.EncodingUtils; - -/** - * URL building logic for the earlier versions of google analytics (urchin.js) - * - * @author : Siddique Hameed, Andre Dietisheim - * @version : 0.2 - */ - -public class GoogleAnalyticsURLStrategy implements IURLBuildingStrategy { - - private static final String TRACKING_URL = "http://www.google-analytics.com/__utm.gif"; - - private static final String ENCODING_UTF8 = "UTF-8"; - - private static final long TIMESTAMP = -1; - - private static final int VISITS = -1; - - private IGoogleAnalyticsParameters googleParameters; - - public GoogleAnalyticsURLStrategy(IGoogleAnalyticsParameters googleAnalyticsParameters) { - this.googleParameters = googleAnalyticsParameters; - } - - public String build(FocusPoint focusPoint) throws UnsupportedEncodingException { - - /* - * Google Analytics for Android: - * - * String str = ""; - * if (paramEvent.action != null) - * str = paramEvent.action; - * if (!(str.startsWith("/"))) - * str = "/" + str; - * str = encode(str); - * Locale localLocale = Locale.getDefault(); - * StringBuilder localStringBuilder = new StringBuilder(); - * localStringBuilder.append("/__utm.gif"); - * localStringBuilder.append("?utmwv=4.3"); - * localStringBuilder.append("&utmn=").append(paramEvent.randomVal); - * localStringBuilder.append("&utmcs=UTF-8"); - * localStringBuilder.append(String.format("&utmsr=%dx%d", new Object[] { - * Integer.valueOf(paramEvent.screenWidth) - * , Integer.valueOf(paramEvent.screenHeight) })); - * localStringBuilder.append(String.format("&utmul=%s-%s", new Object[] { - * localLocale.getLanguage() - * , localLocale.getCountry() })); - * localStringBuilder.append("&utmp=").append(str); - * localStringBuilder.append("&utmac=").append(paramEvent.accountId); - * localStringBuilder.append("&utmcc=").append( - * getEscapedCookieString(paramEvent, paramString)); - * return localStringBuilder.toString(); - */ - - StringBuilder builder = new StringBuilder(TRACKING_URL) - .append(IGoogleAnalyticsParameters.URL_PARAM_DELIMITER); - appendParameter(IGoogleAnalyticsParameters.PARAM_TRACKING_CODE_VERSION, - IGoogleAnalyticsParameters.VALUE_TRACKING_CODE_VERSION, builder); - appendParameter(IGoogleAnalyticsParameters.PARAM_UNIQUE_TRACKING_NUMBER, getRandomNumber(), builder); - // appendParameter(IGoogleAnalyticsParameters.PARAM_HID, - // getRandomNumber(), builder); - appendParameter(IGoogleAnalyticsParameters.PARAM_LANGUAGE_ENCODING, ENCODING_UTF8, builder); - appendParameter(IGoogleAnalyticsParameters.PARAM_SCREEN_COLOR_DEPTH, googleParameters.getScreenColorDepth(), - builder); - appendParameter(IGoogleAnalyticsParameters.PARAM_SCREEN_RESOLUTION, googleParameters.getScreenResolution(), - builder); - appendParameter(IGoogleAnalyticsParameters.PARAM_BROWSER_LANGUAGE, googleParameters.getBrowserLanguage(), - builder); - // appendParameter(IGoogleAnalyticsParameters.PARAM_REPEAT_CAMPAIGN_VISIT, - // "1", builder); - // appendParameter(IGoogleAnalyticsParameters.PARAM_PAGE_TITLE, - // focusPoint.getContentTitle(), builder); - // appendParameter(IGoogleAnalyticsParameters.PARAM_HOST_NAME, - // googleParameters.getHostname(), builder); - // appendParameter(IGoogleAnalyticsParameters.PARAM_REFERRAL, - // googleParameters.getReferral(), builder); - appendParameter(IGoogleAnalyticsParameters.PARAM_PAGE_REQUEST, focusPoint.getContentURI(), builder); - appendParameter(IGoogleAnalyticsParameters.PARAM_ACCOUNT_NAME, googleParameters.getAccountName(), builder); - appendCookies(focusPoint, builder); - appendParameter(IGoogleAnalyticsParameters.PARAM_GAQ, "1", false, builder); - - // StringBuilder builder = new StringBuilder() - // .append(TRACKING_URL) - // .append(URL_PARAM_DELIMITER); - // appendParameter(IGoogleAnalyticsParameters.TRACKING_CODE_VERSION, - // IGoogleAnalyticsParameters.URCHIN_VERSION, builder); - // appendParameter(IGoogleAnalyticsParameters.UNIQUE_TRACKING_NUMBER, - // getRandomNumber(), builder); - // appendParameter(IGoogleAnalyticsParameters.HOST_NAME, - // URLEncoder.encode(googleParameters.getHostname(), ENCODING_UTF8), - // builder); - // appendParameter(IGoogleAnalyticsParameters.REFERRAL, - // URLEncoder.encode(googleParameters.getReferral(), ENCODING_UTF8), - // builder); - // appendParameter(IGoogleAnalyticsParameters.PAGE_REQUEST, - // URLEncoder.encode(appFocusPoint.getContentURI(), ENCODING_UTF8), - // builder); - // appendParameter(IGoogleAnalyticsParameters.ACCOUNT_NAME, - // googleParameters.getAccountName(), builder); - // appendParameter(IGoogleAnalyticsParameters.COOKIE_VALUES, - // "__utma%3D999.999.999.999.999.1%3B", builder); - // appendParameter(IGoogleAnalyticsParameters.LANGUAGE_ENCODING, - // ENCODING_UTF8, builder); - // appendParameter(IGoogleAnalyticsParameters.SCREEN_RESOLUTION, - // googleParameters.getScreenResolution(), builder); - // .append("&utmvid=").append(new EclipseInstance().toString()); - // .append("&utmip=").append(getIpAddress()); - - return builder.toString(); - } - - private void appendCookies(FocusPoint focusPoint, StringBuilder builder) { - - StringBuilder stringBuilder = new StringBuilder(); - stringBuilder.append(IGoogleAnalyticsParameters.PARAM_COOKIES_FIRST_VISIT) - .append(IGoogleAnalyticsParameters.EQUALS_SIGN) - .append("999.") - .append(googleParameters.getUserId()).append(IGoogleAnalyticsParameters.DOT) - .append(TIMESTAMP).append(IGoogleAnalyticsParameters.DOT) - .append(TIMESTAMP).append(IGoogleAnalyticsParameters.DOT) - .append(TIMESTAMP).append(IGoogleAnalyticsParameters.DOT) - .append(VISITS) - .append(IGoogleAnalyticsParameters.PLUS_SIGN) - .append(IGoogleAnalyticsParameters.PARAM_COOKIES_REFERRAL_TYPE) - .append(IGoogleAnalyticsParameters.EQUALS_SIGN) - .append("999.") - .append(TIMESTAMP).append(IGoogleAnalyticsParameters.DOT) - .append("1.1.") - .append(focusPoint.getContentURI()); - - String encodedString = EncodingUtils.checkedEncodeUtf8(stringBuilder.toString()); - builder.append(encodedString); - - // builder.append(IGoogleAnalyticsParameters.PARAM_COOKIE_VALUES) - // .append(IGoogleAnalyticsParameters.EQUALS_SIGN) - // .append("__utma%3D") - // .append(getRandomNumber()) - // .append(".") - // .append(getRandomNumber()) - // .append(".") - // .append(now) - // .append(".") - // .append(now) - // .append(".") - // .append(now) - // .append(".2%3B%2B)") - // - // // .append("__utmb%3D") - // // .append(getRandomNumber()) - // // .append("%3B%2B__utmc%3D") - // // .append(getRandomNumber()) - // // .append("%3B%2B") - // - // .append("__utmz%3D") - // .append(getRandomNumber()) - // .append(".") - // .append(now) - // .append(IGoogleAnalyticsParameters.AMPERSAND); - - // .append("utmcsr%3D(direct)%7C") - // .append("utmccn%3D(direct)%7C") - // .append("utmcmd%3D(none)%3B"); - - } - - private String getRandomNumber() { - return Integer.toString((int) (Math.random() * 0x7fffffff)); - } - - private void appendParameter(String name, String value, StringBuilder builder) { - appendParameter(name, value, true, builder); - } - - private void appendParameter(String name, String value, boolean appendAmpersand, StringBuilder builder) { - builder.append(name) - .append(IGoogleAnalyticsParameters.EQUALS_SIGN) - .append(value); - if (appendAmpersand) { - builder.append(IGoogleAnalyticsParameters.AMPERSAND); - } - } - - // private String getIpAddress() throws SocketException { - // Enumeration<NetworkInterface> e1 = - // (Enumeration<NetworkInterface>)NetworkInterface.getNetworkInterfaces(); - // while(e1.hasMoreElements()) { - // NetworkInterface ni = e1.nextElement(); - // - // System.out.print(ni.getName()); - // System.out.print(" : ["); - // Enumeration<InetAddress> e2 = ni.getInetAddresses(); - // while(e2.hasMoreElements()) { - // InetAddress ia = e2.nextElement(); - // System.out.print(ia); - // if( e2.hasMoreElements()) { - // System.out.print(","); - // } - // } - // System.out.println("]"); - // } - // } -} Copied: trunk/usage/org.jboss.tools.usage/src/org/jboss/tools/usage/jgoogleanalytics/GoogleAnalyticsUrlStrategy.java (from rev 24001, trunk/usage/org.jboss.tools.usage/src/org/jboss/tools/usage/jgoogleanalytics/GoogleAnalyticsURLStrategy.java) =================================================================== --- trunk/usage/org.jboss.tools.usage/src/org/jboss/tools/usage/jgoogleanalytics/GoogleAnalyticsUrlStrategy.java (rev 0) +++ trunk/usage/org.jboss.tools.usage/src/org/jboss/tools/usage/jgoogleanalytics/GoogleAnalyticsUrlStrategy.java 2010-08-11 14:54:08 UTC (rev 24052) @@ -0,0 +1,262 @@ +/******************************************************************************* + * Copyright (c) 2008 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.usage.jgoogleanalytics; + +import java.io.UnsupportedEncodingException; + +import org.jboss.tools.usage.util.EncodingUtils; + +/** + * URL building logic for the earlier versions of google analytics (urchin.js) + * + * @author : Siddique Hameed, Andre Dietisheim + * @version : 0.2 + */ + +public class GoogleAnalyticsUrlStrategy implements IURLBuildingStrategy { + + private static final String TRACKING_URL = "http://www.google-analytics.com/__utm.gif"; + + private static final String ENCODING_UTF8 = "UTF-8"; + + private static final long TIMESTAMP = -1; + + private static final int VISITS = -1; + + private IGoogleAnalyticsParameters googleParameters; + + protected GoogleAnalyticsUrlStrategy(IGoogleAnalyticsParameters googleAnalyticsParameters) { + this.googleParameters = googleAnalyticsParameters; + } + + public String build(FocusPoint focusPoint) throws UnsupportedEncodingException { + /* + * Google Analytics for Android: + * + String str = ""; + if (paramEvent.action != null) + str = paramEvent.action; + if (!(str.startsWith("/"))) + str = "/" + str; + str = encode(str); + Locale localLocale = Locale.getDefault(); + StringBuilder localStringBuilder = new StringBuilder(); + localStringBuilder.append("/__utm.gif"); + localStringBuilder.append("?utmwv=4.3"); + localStringBuilder.append("&utmn=").append(paramEvent.randomVal); + localStringBuilder.append("&utmcs=UTF-8"); + localStringBuilder.append(String.format("&utmsr=%dx%d", new Object[] { + Integer.valueOf(paramEvent.screenWidth) + , Integer.valueOf(paramEvent.screenHeight) })); + localStringBuilder.append(String.format("&utmul=%s-%s", new Object[] { + localLocale.getLanguage() + , localLocale.getCountry() })); + localStringBuilder.append("&utmp=").append(str); + localStringBuilder.append("&utmac=").append(paramEvent.accountId); + localStringBuilder.append("&utmcc=").append( + getEscapedCookieString(paramEvent, paramString)); + return localStringBuilder.toString(); + + * + * getEscapedCookieString: + * + StringBuilder localStringBuilder = new StringBuilder(); + localStringBuilder.append("__utma="); + localStringBuilder.append("999").append("."); + localStringBuilder.append(paramEvent.userId).append("."); + localStringBuilder.append(paramEvent.timestampFirst).append("."); + localStringBuilder.append(paramEvent.timestampPrevious).append("."); + localStringBuilder.append(paramEvent.timestampCurrent).append("."); + localStringBuilder.append(paramEvent.visits); + if (paramString != null) + { + localStringBuilder.append("+__utmz="); + localStringBuilder.append("999").append("."); + localStringBuilder.append(paramEvent.timestampFirst).append("."); + localStringBuilder.append("1.1."); + localStringBuilder.append(paramString); + } + return encode(localStringBuilder.toString()); + + */ + + /* + * our working tracking code + * + http://www.google-analytics.com/__utm.gif?utmwv=4.7.2 + &utmn=338321265 + &utmhn=jboss.org + &utmcs=UTF-8 + &utmsr=1920x1080 + &utmsc=24-bit + &utmul=en-us + &utmje=1 + &utmfl=10.1%20r53 + &utmdt=-%20JBoss%20Community + &utmhid=1087431432 + &utmr=0 + &utmp=%2Ftools%2Fusage.html + &utmac=UA-17645367-1 + &utmcc=__utma%3D156030500.1285760711.1281430767.1281430767.1281430767.1%3B%2B__utmz%3D156030500.1281430767.1.1.utmcsr%3D(direct)%7Cutmccn%3D(direct)%7Cutmcmd%3D(none)%3B + &gaq=1 + * + */ + + StringBuilder builder = new StringBuilder(TRACKING_URL) + .append(IGoogleAnalyticsParameters.URL_PARAM_DELIMITER); + appendParameter(IGoogleAnalyticsParameters.PARAM_TRACKING_CODE_VERSION, + IGoogleAnalyticsParameters.VALUE_TRACKING_CODE_VERSION, builder); + appendParameter(IGoogleAnalyticsParameters.PARAM_UNIQUE_TRACKING_NUMBER, getRandomNumber(), builder); + appendParameter(IGoogleAnalyticsParameters.PARAM_HID, getRandomNumber(), builder); + // appendParameter(IGoogleAnalyticsParameters.PARAM_HID, + // getRandomNumber(), builder); + appendParameter(IGoogleAnalyticsParameters.PARAM_LANGUAGE_ENCODING, ENCODING_UTF8, builder); + appendParameter(IGoogleAnalyticsParameters.PARAM_SCREEN_COLOR_DEPTH, googleParameters.getScreenColorDepth(), + builder); + appendParameter(IGoogleAnalyticsParameters.PARAM_SCREEN_RESOLUTION, googleParameters.getScreenResolution(), + builder); + appendParameter(IGoogleAnalyticsParameters.PARAM_BROWSER_LANGUAGE, googleParameters.getBrowserLanguage(), + builder); + // appendParameter(IGoogleAnalyticsParameters.PARAM_REPEAT_CAMPAIGN_VISIT, + // "1", builder); + // appendParameter(IGoogleAnalyticsParameters.PARAM_PAGE_TITLE, + // focusPoint.getContentTitle(), builder); + // appendParameter(IGoogleAnalyticsParameters.PARAM_HOST_NAME, + // googleParameters.getHostname(), builder); + // appendParameter(IGoogleAnalyticsParameters.PARAM_REFERRAL, + // googleParameters.getReferral(), builder); + appendParameter(IGoogleAnalyticsParameters.PARAM_PAGE_REQUEST, focusPoint.getContentURI(), builder); + appendParameter(IGoogleAnalyticsParameters.PARAM_ACCOUNT_NAME, googleParameters.getAccountName(), builder); + appendCookies(focusPoint, builder); + // appendParameter(IGoogleAnalyticsParameters.PARAM_GAQ, "1", false, + // builder); + + // StringBuilder builder = new StringBuilder() + // .append(TRACKING_URL) + // .append(URL_PARAM_DELIMITER); + // appendParameter(IGoogleAnalyticsParameters.TRACKING_CODE_VERSION, + // IGoogleAnalyticsParameters.URCHIN_VERSION, builder); + // appendParameter(IGoogleAnalyticsParameters.UNIQUE_TRACKING_NUMBER, + // getRandomNumber(), builder); + // appendParameter(IGoogleAnalyticsParameters.HOST_NAME, + // URLEncoder.encode(googleParameters.getHostname(), ENCODING_UTF8), + // builder); + // appendParameter(IGoogleAnalyticsParameters.REFERRAL, + // URLEncoder.encode(googleParameters.getReferral(), ENCODING_UTF8), + // builder); + // appendParameter(IGoogleAnalyticsParameters.PAGE_REQUEST, + // URLEncoder.encode(appFocusPoint.getContentURI(), ENCODING_UTF8), + // builder); + // appendParameter(IGoogleAnalyticsParameters.ACCOUNT_NAME, + // googleParameters.getAccountName(), builder); + // appendParameter(IGoogleAnalyticsParameters.COOKIE_VALUES, + // "__utma%3D999.999.999.999.999.1%3B", builder); + // appendParameter(IGoogleAnalyticsParameters.LANGUAGE_ENCODING, + // ENCODING_UTF8, builder); + // appendParameter(IGoogleAnalyticsParameters.SCREEN_RESOLUTION, + // googleParameters.getScreenResolution(), builder); + // .append("&utmvid=").append(new EclipseInstance().toString()); + // .append("&utmip=").append(getIpAddress()); + + return builder.toString(); + } + + private void appendCookies(FocusPoint focusPoint, StringBuilder builder) { + + StringBuilder stringBuilder = new StringBuilder(); + stringBuilder.append(IGoogleAnalyticsParameters.PARAM_COOKIES_FIRST_VISIT) + .append(IGoogleAnalyticsParameters.EQUALS_SIGN) + .append("999.") + .append(googleParameters.getUserId()).append(IGoogleAnalyticsParameters.DOT) + .append(TIMESTAMP).append(IGoogleAnalyticsParameters.DOT) + .append(TIMESTAMP).append(IGoogleAnalyticsParameters.DOT) + .append(TIMESTAMP).append(IGoogleAnalyticsParameters.DOT) + .append(VISITS) + .append(IGoogleAnalyticsParameters.PLUS_SIGN) + .append(IGoogleAnalyticsParameters.PARAM_COOKIES_REFERRAL_TYPE) + .append(IGoogleAnalyticsParameters.EQUALS_SIGN) + .append("999.") + .append(TIMESTAMP).append(IGoogleAnalyticsParameters.DOT) + .append("1.1.") + .append(focusPoint.getContentURI()); + + String encodedString = EncodingUtils.checkedEncodeUtf8(stringBuilder.toString()); + builder.append(encodedString); + + // builder.append(IGoogleAnalyticsParameters.PARAM_COOKIE_VALUES) + // .append(IGoogleAnalyticsParameters.EQUALS_SIGN) + // .append("__utma%3D") + // .append(getRandomNumber()) + // .append(".") + // .append(getRandomNumber()) + // .append(".") + // .append(now) + // .append(".") + // .append(now) + // .append(".") + // .append(now) + // .append(".2%3B%2B)") + // + // // .append("__utmb%3D") + // // .append(getRandomNumber()) + // // .append("%3B%2B__utmc%3D") + // // .append(getRandomNumber()) + // // .append("%3B%2B") + // + // .append("__utmz%3D") + // .append(getRandomNumber()) + // .append(".") + // .append(now) + // .append(IGoogleAnalyticsParameters.AMPERSAND); + + // .append("utmcsr%3D(direct)%7C") + // .append("utmccn%3D(direct)%7C") + // .append("utmcmd%3D(none)%3B"); + + } + + private String getRandomNumber() { + return Integer.toString((int) (Math.random() * 0x7fffffff)); + } + + private void appendParameter(String name, String value, StringBuilder builder) { + appendParameter(name, value, true, builder); + } + + private void appendParameter(String name, String value, boolean appendAmpersand, StringBuilder builder) { + builder.append(name) + .append(IGoogleAnalyticsParameters.EQUALS_SIGN) + .append(value); + if (appendAmpersand) { + builder.append(IGoogleAnalyticsParameters.AMPERSAND); + } + } + + // private String getIpAddress() throws SocketException { + // Enumeration<NetworkInterface> e1 = + // (Enumeration<NetworkInterface>)NetworkInterface.getNetworkInterfaces(); + // while(e1.hasMoreElements()) { + // NetworkInterface ni = e1.nextElement(); + // + // System.out.print(ni.getName()); + // System.out.print(" : ["); + // Enumeration<InetAddress> e2 = ni.getInetAddresses(); + // while(e2.hasMoreElements()) { + // InetAddress ia = e2.nextElement(); + // System.out.print(ia); + // if( e2.hasMoreElements()) { + // System.out.print(","); + // } + // } + // System.out.println("]"); + // } + // } +} Property changes on: trunk/usage/org.jboss.tools.usage/src/org/jboss/tools/usage/jgoogleanalytics/GoogleAnalyticsUrlStrategy.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/usage/org.jboss.tools.usage/src/org/jboss/tools/usage/jgoogleanalytics/HttpGetMethod.java =================================================================== --- trunk/usage/org.jboss.tools.usage/src/org/jboss/tools/usage/jgoogleanalytics/HttpGetMethod.java 2010-08-11 14:50:06 UTC (rev 24051) +++ trunk/usage/org.jboss.tools.usage/src/org/jboss/tools/usage/jgoogleanalytics/HttpGetMethod.java 2010-08-11 14:54:08 UTC (rev 24052) @@ -24,11 +24,13 @@ private ILoggingAdapter loggingAdapter = null; - private CookieManager cookieHandler = new CookieManager(); + private CookieManager cookieHandler; private String userAgent; public HttpGetMethod(String userAgent) { this.userAgent = userAgent; + this.cookieHandler = new CookieManager(); + cookieHandler.setCookiePolicy(CookiePolicy.ACCEPT_ALL); } public void setLoggingAdapter(ILoggingAdapter loggingAdapter) { @@ -37,7 +39,7 @@ public void request(String urlString) { - CookieHandler originalCookieHandler = setupCookieHandler(); + CookieHandler currentCookieHandler = setCookieHandler(cookieHandler); try { HttpURLConnection urlConnection = createURLConnection(urlString, userAgent); urlConnection.connect(); @@ -50,21 +52,29 @@ } catch (Exception e) { logError(e.getMessage()); } finally { - CookieHandler.setDefault(originalCookieHandler); + setCookieHandler(currentCookieHandler); } } - private CookieHandler setupCookieHandler() { - CookieHandler old = CookieHandler.getDefault(); - cookieHandler.setCookiePolicy(CookiePolicy.ACCEPT_ALL); - CookieHandler.setDefault(cookieHandler); - return old; - } - + /** + * Returns the return code from the given {@link HttpURLConnection}. + * Provided to be called by test cases so that they can retrieve the return code. + * + * @param urlConnection + * to get the response code from + * @return the return code the HttpUrlConnection received + * @throws IOException + */ protected int getResponseCode(HttpURLConnection urlConnection) throws IOException { return urlConnection.getResponseCode(); } + private CookieHandler setCookieHandler(CookieHandler cookieHandler) { + CookieHandler currentCookieHandler = CookieHandler.getDefault(); + CookieHandler.setDefault(cookieHandler); + return currentCookieHandler; + } + protected HttpURLConnection createURLConnection(String urlString, String userAgent) throws IOException { URL url = new URL(urlString); HttpURLConnection urlConnection = (HttpURLConnection) url.openConnection(); Modified: trunk/usage/org.jboss.tools.usage/src/org/jboss/tools/usage/jgoogleanalytics/IGoogleAnalyticsParameters.java =================================================================== --- trunk/usage/org.jboss.tools.usage/src/org/jboss/tools/usage/jgoogleanalytics/IGoogleAnalyticsParameters.java 2010-08-11 14:50:06 UTC (rev 24051) +++ trunk/usage/org.jboss.tools.usage/src/org/jboss/tools/usage/jgoogleanalytics/IGoogleAnalyticsParameters.java 2010-08-11 14:54:08 UTC (rev 24052) @@ -43,7 +43,8 @@ public static final String PARAM_PAGE_TITLE = "utmdt"; public static final String PARAM_GAQ = "gaq"; - public static final String VALUE_TRACKING_CODE_VERSION = "4.3"; + + public static final String VALUE_TRACKING_CODE_VERSION = "4.7.2"; public static final String VALUE_NO_REFERRAL = "-"; public static final char PLUS_SIGN = '+'; public static final String PARAM_COOKIES_REFERRAL_TYPE = "__utmz"; Modified: trunk/usage/org.jboss.tools.usage/src/org/jboss/tools/usage/jgoogleanalytics/JGoogleAnalyticsTracker.java =================================================================== --- trunk/usage/org.jboss.tools.usage/src/org/jboss/tools/usage/jgoogleanalytics/JGoogleAnalyticsTracker.java 2010-08-11 14:50:06 UTC (rev 24051) +++ trunk/usage/org.jboss.tools.usage/src/org/jboss/tools/usage/jgoogleanalytics/JGoogleAnalyticsTracker.java 2010-08-11 14:54:08 UTC (rev 24052) @@ -41,7 +41,7 @@ */ public JGoogleAnalyticsTracker(IGoogleAnalyticsParameters googleParameters) { this.httpRequest = new HttpGetMethod(googleParameters.getUserAgent()); - this.urlBuildingStrategy = new GoogleAnalyticsURLStrategy(googleParameters); + this.urlBuildingStrategy = new GoogleAnalyticsUrlStrategy(googleParameters); } /**

15 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r24051 - trunk/esb/plugins/org.jboss.tools.esb.core/resources/help.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2010-08-11 10:50:06 -0400 (Wed, 11 Aug 2010) New Revision: 24051 Modified: trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb.properties Log: https://jira.jboss.org/browse/JBIDE-6614 Modified: trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb.properties =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb.properties 2010-08-11 14:41:31 UTC (rev 24050) +++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb.properties 2010-08-11 14:50:06 UTC (rev 24051) @@ -554,9 +554,12 @@ # Actions extension -ESBPreActionBusinessRulesProcessor101_AddObjectPath.WindowTitle=Add Object Path -ESBPreActionBusinessRulesProcessor101_AddObjectPath.Title=ESB Object Path +ESB.AddObjectPath.WindowTitle=Add Object Path +ESB.AddObjectPath.Title=ESB Object Path +ESB.AddSendTo.WindowTitle=Add Channel +ESB.AddSendTo.Title=ESB Send To + ESBPreActionNotifier101_AddNotificationList.WindowTitle=Add Notification List ESBPreActionNotifier101_AddNotificationList.Title=ESB Notification List @@ -564,7 +567,7 @@ ESB.AddAlias.Title=ESB Alias ESB.AddFrom.WindowTitle=Add From -ESB.AddFrom.Title=ESB From! +ESB.AddFrom.Title=ESB From ESB.AddNamespace.WindowTitle=Add Namespace ESB.AddNamespace.Title=ESB Namespace @@ -616,6 +619,7 @@ ESBPreRouteTo_Properties.Title=ESB Route To ESBPreObjectPath_Properties.Title=ESB Object Path +ESBPreSendTo_Properties.Title=ESB Send To ESBPreTarget_CreateTag.WindowTitle=Add Tag ESBPreTarget_CreateTag.Title=XML Element @@ -794,6 +798,7 @@ ESBPreActionXSLTAction120_Properties.Title=XSLT Action ESBPreActionXStreamToObject101_Properties.Title=XStream to Object ESBPreActionBusinessRulesProcessor101_Properties.Title=Business Rules Processor +ESBPreActionBusinessRulesProcessor130_Properties.Title=Business Rules Processor ESBPreNotifyAttachment_Properties.Title=Attachment

15 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r24050 - trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2010-08-11 10:41:31 -0400 (Wed, 11 Aug 2010) New Revision: 24050 Modified: trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form/ESBListsFormLayoutData.java trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form/ESBXMLFormLayoutData.java Log: https://jira.jboss.org/browse/JBIDE-6614 Modified: trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form/ESBListsFormLayoutData.java =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form/ESBListsFormLayoutData.java 2010-08-11 14:40:55 UTC (rev 24049) +++ trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form/ESBListsFormLayoutData.java 2010-08-11 14:41:31 UTC (rev 24050) @@ -107,6 +107,14 @@ FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddAnyAction") //$NON-NLS-1$ ); + static IFormData ESB_ACTION_130_LIST_DEFINITION = new FormData( + "Actions", //$NON-NLS-1$ + ModelFormLayoutData.EMPTY_DESCRIPTION, + new FormAttributeData[]{new FormAttributeData(ATTR_NAME, 100)}, + getActionEntities(ENT_ESB_ACTIONS_130), + FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddAnyAction") //$NON-NLS-1$ + ); + static IFormData ESB_ACTION_SUB_LIST_DEFINITION = new FormData( "Actions", //$NON-NLS-1$ ModelFormLayoutData.EMPTY_DESCRIPTION, @@ -178,6 +186,10 @@ "Object Paths List", "esb", ENT_ESB_OBJECT_PATH, "CreateActions.AddObjectPath" ); + static IFormData ESB_SEND_TO_LIST_DEFINITION = createOneAttributeSingleChildList( + "Channels", "channel name", ENT_ESB_SEND_TO, "CreateActions.AddSendTo" + ); + static IFormData ALIAS_LIST_DEFINITION = createOneAttributeSingleChildList( "Alias List", "name", ConverterConstants.ALIAS_ENTITY, "CreateActions.AddAlias" ); Modified: trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form/ESBXMLFormLayoutData.java =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form/ESBXMLFormLayoutData.java 2010-08-11 14:40:55 UTC (rev 24049) +++ trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form/ESBXMLFormLayoutData.java 2010-08-11 14:41:31 UTC (rev 24050) @@ -96,6 +96,8 @@ list.add(ESBListsFormLayoutData.ESB_ACTION_110_LIST_DEFINITION); } else if(entityName.equals(ENT_ESB_ACTIONS_120)) { list.add(ESBListsFormLayoutData.ESB_ACTION_120_LIST_DEFINITION); + } else if(entityName.equals(ENT_ESB_ACTIONS_130)) { + list.add(ESBListsFormLayoutData.ESB_ACTION_130_LIST_DEFINITION); } else if(entityName.startsWith(ENT_ESB_SERVICES)) { list.add(ESBListsFormLayoutData.ESB_SERVICE_LIST_DEFINITION); } else if(entityName.startsWith(ENT_ESB_SERVICE)) {

15 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r24049 - in trunk/esb/tests/org.jboss.tools.esb.core.test: src/org/jboss/tools/esb/core/test and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2010-08-11 10:40:55 -0400 (Wed, 11 Aug 2010) New Revision: 24049 Added: trunk/esb/tests/org.jboss.tools.esb.core.test/projects/Test/esb-1.3/jboss-esb-brp.xml Modified: trunk/esb/tests/org.jboss.tools.esb.core.test/src/org/jboss/tools/esb/core/test/ESBModelTest.java Log: https://jira.jboss.org/browse/JBIDE-6614 Added: trunk/esb/tests/org.jboss.tools.esb.core.test/projects/Test/esb-1.3/jboss-esb-brp.xml =================================================================== --- trunk/esb/tests/org.jboss.tools.esb.core.test/projects/Test/esb-1.3/jboss-esb-brp.xml (rev 0) +++ trunk/esb/tests/org.jboss.tools.esb.core.test/projects/Test/esb-1.3/jboss-esb-brp.xml 2010-08-11 14:40:55 UTC (rev 24049) @@ -0,0 +1,74 @@ +<?xml version="1.0"?> +<jbossesb + xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml..." + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml... http://anonsvn.jboss.org/repos/labs/labs/jbossesb/trunk/product/etc/schem..."> + <services> + <service category="c" description="d" name="s"> + <actions> + <action class="org.jboss.soa.esb.actions.BusinessRulesProcessor" name="OrderDiscountRuleService"> + <property name="ruleSet" value="drl/OrderDiscount.drl"/> + <property name="ruleReload" value="true"/> + <property name="object-paths"> + <object-path esb="body.Order"/> + </property> + </action> + <action class="org.jboss.soa.esb.actions.BusinessRulesProcessor" name="OrderDiscountMultipleRuleServiceStateful"> + <property name="ruleSet" value="drl/OrderDiscountOnMultipleOrders.drl"/> + <property name="ruleReload" value="false"/> + <property name="stateful" value="true"/> + <property name="object-paths"> + <object-path esb="body.Customer"/> + <object-path esb="body.Order"/> + </property> + </action> + <action class="org.jboss.soa.esb.actions.BusinessRulesProcessor" name="OrderEventsRuleServiceStateful"> + <property name="ruleSet" value="drl/OrderEvents.drl"/> + <property name="ruleReload" value="false"/> + <property name="stateful" value="true"/> + <property name="ruleAuditType" value="THREADED_FILE"/> + <property name="ruleAuditFile" value="myaudit"/> + <property name="ruleAuditInterval" value="1000"/> + <property name="ruleClockType" value="REALTIME"/> + <property name="ruleEventProcessingType" value="STREAM"/> + <property name="ruleFireMethod" value="FIRE_UNTIL_HALT"/> + <property name="object-paths"> + <object-path entry-point="OrderStatusStream" esb="body.OrderStatus"/> + <object-path entry-point="OrderInfoStream" esb="body.OrderInfo"/> + </property> + <property name="channels"> + <send-to channel-name="chan1" service-category="cat1" service-name="svc1"/> + <send-to async="true" + channel-class="org.jboss.soa.esb.services.rules.ServiceChannel" + channel-name="chan2" service-category="cat1" service-name="svc1" + set-payload-location="org.jboss.soa.esb.message.defaultEntry" timeout="30000"/> + <send-to channel-class="com.example.MyChannel" channel-name="chan3"/> + </property> + </action> + <action class="org.jboss.soa.esb.actions.BusinessRulesProcessor" name="PolicyApprovalRuleService"> + <property name="ruleSet" value="dsl/approval.dslr"/> + <property name="ruleLanguage" value="dsl/acme.dsl"/> + <property name="ruleReload" value="true"/> + <property name="object-paths"> + <object-path esb="body.Driver"/> + <object-path esb="body.Policy"/> + </property> + </action> + <action class="org.jboss.soa.esb.actions.BusinessRulesProcessor" name="PolicyPricingRuleService"> + <property name="decisionTable" value="decisionTable/PolicyPricing.xls"/> + <property name="ruleReload" value="true"/> + <property name="object-paths"> + <object-path esb="body.Driver"/> + <object-path esb="body.Policy"/> + </property> + </action> + <action class="org.jboss.soa.esb.actions.BusinessRulesProcessor" name="RuleAgentPolicyService"> + <property name="ruleAgentProperties" value="ruleAgent/brmsdeployedrules.properties"/> + <property name="object-paths"> + <object-path esb="body.Driver"/> + <object-path esb="body.Policy"/> + </property> + </action> + </actions> + </service> + </services> +</jbossesb> Property changes on: trunk/esb/tests/org.jboss.tools.esb.core.test/projects/Test/esb-1.3/jboss-esb-brp.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/esb/tests/org.jboss.tools.esb.core.test/src/org/jboss/tools/esb/core/test/ESBModelTest.java =================================================================== --- trunk/esb/tests/org.jboss.tools.esb.core.test/src/org/jboss/tools/esb/core/test/ESBModelTest.java 2010-08-11 14:40:07 UTC (rev 24048) +++ trunk/esb/tests/org.jboss.tools.esb.core.test/src/org/jboss/tools/esb/core/test/ESBModelTest.java 2010-08-11 14:40:55 UTC (rev 24049) @@ -370,6 +370,55 @@ assertTrue(errorList.toString(), errorList.length() == 0); } + public void testBusinessRulesProcessor_4_9() { + XModelObject object = getFileObject("esb-1.3", "jboss-esb-brp.xml", ESBConstants.ENT_ESB_FILE_130); + + StringBuffer errorList = new StringBuffer(); + + // 1. + String orderDiscountRuleServicePath = "Services/s/Actions/OrderDiscountRuleService"; + + String[][] orderDiscountRuleServiceAttrValues = { + {"rule set", "drl/OrderDiscount.drl"}, + {"rule reload", "true"}, + }; + checkAttributes(object, orderDiscountRuleServicePath, orderDiscountRuleServiceAttrValues, errorList); + + String routePath = orderDiscountRuleServicePath + "/body.Order"; + String[][] routeAttrValues = { + {"esb", "body.Order"}, + }; + checkAttributes(object, routePath, routeAttrValues, errorList); + + // 3. + String orderEventsRuleServiceStatefulPath = "Services/s/Actions/OrderEventsRuleServiceStateful"; + String[][] orderEventsRuleServiceStatefulAttrValues = { + {"rule set", "drl/OrderEvents.drl"}, + {"rule reload", "false"}, + {"stateful", "true"}, + {"rule audit type", "THREADED_FILE"}, + {"rule audit file", "myaudit"}, + {"rule audit interval", "1000"}, + {"rule clock type", "REALTIME"}, + {"rule event processing type", "STREAM"}, + {"rule fire method", "FIRE_UNTIL_HALT"}, + }; + checkAttributes(object, orderEventsRuleServiceStatefulPath, orderEventsRuleServiceStatefulAttrValues, errorList); + + String channelPath = orderEventsRuleServiceStatefulPath + "/chan2"; + String[][] channelAttrValues = { + {"channel name", "chan2"}, + {"service category", "cat1"}, + {"service name", "svc1"}, + {"channel class", "org.jboss.soa.esb.services.rules.ServiceChannel"}, + {"set payload location", "org.jboss.soa.esb.message.defaultEntry"}, + {"timeout", "30000"}, + }; + checkAttributes(object, channelPath, channelAttrValues, errorList); + + assertTrue(errorList.toString(), errorList.length() == 0); + } + XModelObject getFileObject(String parentPath, String xmlname) { return getFileObject(parentPath, xmlname, ESBConstants.ENT_ESB_FILE_101); }

15 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r24048 - in trunk/esb/plugins/org.jboss.tools.esb.core: src/org/jboss/tools/esb/core/model and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2010-08-11 10:40:07 -0400 (Wed, 11 Aug 2010) New Revision: 24048 Modified: trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb13.meta trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/ESBConstants.java trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/SpecificActionLoader.java trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/ConverterConstants.java Log: https://jira.jboss.org/browse/JBIDE-6614 Modified: trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta 2010-08-11 14:39:58 UTC (rev 24047) +++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta 2010-08-11 14:40:07 UTC (rev 24048) @@ -32,6 +32,7 @@ <PAIR name="org.jboss.soa.esb.actions.routing.http.HttpRouter" value="ESBPreActionHTTPRouter"/> <PAIR name="org.jboss.soa.esb.actions.scripting.GroovyActionProcessor" value="ESBPreActionGroovyProcessor"/> + <PAIR name="org.jboss.soa.esb.actions.scripting.ScriptingAction" value="ESBPreActionScripting"/> <PAIR name="org.jboss.soa.esb.actions.soap.SOAPClient" value="ESBPreActionSOAPClient"/> <PAIR name="org.jboss.soa.esb.actions.soap.SOAPProcessor" value="ESBPreActionSOAPProcessor"/> <PAIR name="org.jboss.soa.esb.actions.soap.proxy.SOAPProxy" value="ESBPreActionSOAPProxy"/> @@ -39,7 +40,6 @@ <PAIR name="org.jboss.soa.esb.actions.transformation.xslt.XsltAction" value="ESBPreActionXSLTAction"/> <PAIR name="org.jboss.soa.esb.actions.validation.SchemaValidationAction" value="ESBPreActionSchemaValidator"/> - <PAIR name="org.jboss.soa.esb.actions.scripting.ScriptingAction" value="ESBPreActionScripting"/> <PAIR name="org.jboss.soa.esb.services.jbpm.actions.BpmProcessor" value="ESBPreActionBpmProcessor"/> <PAIR name="org.jboss.soa.esb.smooks.SmooksAction" value="ESBPreActionSmooksAction"/> </MAPPING> @@ -359,6 +359,180 @@ </XActionItem> <XDependencies/> </XModelEntity> + <XModelEntity + ImplementingClass="org.jboss.tools.esb.core.model.impl.BusinessRulesProcessor" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;children=%EntityOrdered%" + XMLSUBPATH="action" name="ESBPreActionBusinessRulesProcessor130"> + <XChildrenEntities> + <XChildEntity name="ESBProperty"/> + <XChildEntity name="ESBPreObjectPath"/> + <XChildEntity name="ESBPreSendTo"/> + </XChildrenEntities> + <XEntityRenderer> + <ICONS> + <ICON info="main.esb.action" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="business rules processor" + loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general;id=true;save=always" + name="name" xmlname="name"/> + <XModelAttribute PROPERTIES="category=general;save=always" + default="org.jboss.soa.esb.actions.BusinessRulesProcessor" + name="class" xmlname="class"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="pre=true;category=general" + name="rule set" xmlname="ruleSet"> + <Constraint loader="Tree"> + <value name="ESBResourceTree"/> + <value name="extensions=drl,dslr"/> + <value name="linkAction=OpenRuleSet"/> + </Constraint> + <Editor name="TreeChooser"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general;pre=true" + name="rule language" xmlname="ruleLanguage"/> + <XModelAttribute PROPERTIES="pre=true;category=general" + name="rule agent properties" xmlname="ruleAgentProperties"> + <Constraint loader="Tree"> + <value name="ESBResourceTree"/> + <value name="extensions=properties"/> + <value name="linkAction=OpenRuleAgent"/> + </Constraint> + <Editor name="TreeChooser"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="pre=true;category=general" + name="decision table" xmlname="decisionTable"> + <Constraint loader="Tree"> + <value name="ESBResourceTree"/> + <value name="extensions=xls"/> + <value name="linkAction=OpenDecisionTable"/> + </Constraint> + <Editor name="TreeChooser"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="pre=true;category=general" + default="Default(false)" name="rule reload" xmlname="ruleReload"> + <Constraint loader="ListString"> + <value name="Default(false)"/> + <value name="true"/> + <value name="false"/> + </Constraint> + <Editor name="ListString"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="pre=true;category=general" + default="Default(false)" name="stateful" xmlname="stateful"> + <Constraint loader="ListString"> + <value name="Default(false)"/> + <value name="true"/> + <value name="false"/> + </Constraint> + <Editor name="ListString"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="pre=true;category=advanced" + name="rule audit type" xmlname="ruleAuditType"> + <Constraint loader="ListString"> + <value/> + <value name="CONSOLE"/> + <value name="FILE"/> + <value name="THREADED_FILE"/> + </Constraint> + <Editor name="ListString"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="pre=true;category=advanced" + name="rule audit file" xmlname="ruleAuditFile"> + <Constraint loader="Tree"> + <value name="ESBResourceTree"/> + <value name="linkAction=OpenAuditFile"/> + </Constraint> + <Editor name="TreeChooser"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="pre=true;category=advanced" + name="rule audit interval" xmlname="ruleAuditInterval"/> + <XModelAttribute PROPERTIES="pre=true;category=advanced" + default="Default(REALTIME)" name="rule clock type" xmlname="ruleClockType"> + <Constraint loader="ListString"> + <value name="Default(REALTIME)"/> + <value name="REALTIME"/> + <value name="PSEUDO"/> + </Constraint> + <Editor name="ListString"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="pre=true;category=advanced" + default="Default(CLOUD)" name="rule event processing type" xmlname="ruleEventProcessingType"> + <Constraint loader="ListString"> + <value name="Default(CLOUD)"/> + <value name="CLOUD"/> + <value name="STREAM"/> + </Constraint> + <Editor name="ListString"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="pre=true;category=advanced" + default="Default(FIRE_ALL_RULES)" name="rule fire method" xmlname="ruleFireMethod"> + <Constraint loader="ListString"> + <value name="Default(FIRE_ALL_RULES)"/> + <value name="FIRE_ALL_RULES"/> + <value name="FIRE_UNTIL_HALT"/> + </Constraint> + <Editor name="ListString"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general" name="process" xmlname="process"> + <Constraint loader="ListString"> + <value name="process"/> + <value name="split"/> + </Constraint> + <Editor name="ListString"/> + </XModelAttribute> + <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> + <Editor name="Note"/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItem + HandlerClassName="org.jboss.tools.esb.core.model.handlers.OpenESBResourceHandler" + ICON="action.empty" PROPERTIES="actionpath=Open;attribute=rule set" + displayName="Open Rule Set" kind="action" name="OpenRuleSet"/> + <XActionItem + HandlerClassName="org.jboss.tools.esb.core.model.handlers.OpenESBResourceHandler" + ICON="action.empty" + PROPERTIES="actionpath=Open;attribute=decision table" + displayName="Open Decision Table" kind="action" name="OpenDecisionTable"/> + <XActionItem + HandlerClassName="org.jboss.tools.esb.core.model.handlers.OpenESBResourceHandler" + ICON="action.empty" + PROPERTIES="actionpath=Open;attribute=rule agent properties" + displayName="Open Rule Agent Properties" kind="action" name="OpenRuleAgent"/> + <XActionItem + HandlerClassName="org.jboss.tools.esb.core.model.handlers.OpenESBResourceHandler" + ICON="action.empty" + PROPERTIES="actionpath=Open;attribute=rule audit file" + displayName="Open Audit File" kind="action" name="OpenAuditFile"/> + <XActionItem kind="list" name="CreateActions"> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Add Object Path..." kind="action" name="AddObjectPath"> + <EntityData EntityName="ESBPreObjectPath"> + <AttributeData AttributeName="esb"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Add Channel..." kind="action" name="AddSendTo"> + <EntityData EntityName="ESBPreSendTo"> + <AttributeData AttributeName="channel name"/> + </EntityData> + </XActionItem> + </XActionItem> + <XActionItemReference entity="ESBProperty" name="CopyActions"/> + <XActionItemReference entity="ESBProperty" name="DeleteActions"/> + <XActionItemReference entity="ESBProperty" name="Properties"/> + <XActionItemReference entity="ESBProperty" name="MoveActions"/> + </XActionItem> + <XDependencies/> + </XModelEntity> <XModelEntity ImplementingClass="%ESB%" PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData" XMLSUBPATH="action" name="ESBPreActionByteArrayToString101"> @@ -3182,6 +3356,53 @@ </XActionItem> <XDependencies/> </XModelEntity> + <XModelEntity + ImplementingClass="org.jboss.tools.esb.core.model.ESBRouteToImpl" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;converter=send" + XMLSUBPATH="send-to" name="ESBPreSendTo"> + <XChildrenEntities/> + <XEntityRenderer> + <ICONS> + <ICON info="main.esb.property" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="send to" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general;id=true;save=always" + name="channel name" xmlname="channel-name"/> + <XModelAttribute PROPERTIES="category=general" + name="service category" xmlname="service-category"/> + <XModelAttribute PROPERTIES="category=general" name="service name" xmlname="service-name"/> + <XModelAttribute PROPERTIES="category=general" name="channel class" xmlname="channel-class"> + <Editor name="AccessibleJava"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=advanced" name="async" xmlname="async"> + <Constraint loader="ListString"> + <value/> + <value name="true"/> + <value name="false"/> + </Constraint> + <Editor name="ListString"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=advanced" name="timeout" xmlname="timeout"/> + <XModelAttribute PROPERTIES="category=advanced;pre=true" + name="set payload location" xmlname="set-payload-location"/> + <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> + <Editor name="Note"/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItem kind="list" name="CreateActions"/> + <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/> + <XActionItemReference entity="ESBPreAlias" name="CopyActions"/> + <XActionItemReference entity="ESBPreAlias" name="DeleteActions"/> + <XActionItemReference entity="ESBPreAlias" name="Properties"/> + <XActionItemReference entity="ESBPreAlias" name="MoveActions"/> + </XActionItem> + <XDependencies/> + </XModelEntity> <XModelEntity ImplementingClass="%ESB%" PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData" XMLSUBPATH="target" name="ESBPreTarget"> @@ -3945,4 +4166,326 @@ </XActionItem> </XActionItem> </XEntityExtension> + <XEntityExtension name="ESBActions130"> + <XChildrenEntities> + <XChildEntity name="ESBPreActionByteArrayToString101"/> + <XChildEntity name="ESBPreActionLongToDateConverter101"/> + <XChildEntity name="ESBPreActionObjectInvoke101"/> + <XChildEntity name="ESBPreActionObjectToCSVString101"/> + <XChildEntity name="ESBPreActionObjectToXStream101"/> + <XChildEntity name="ESBPreActionSmooksAction101"/> + <XChildEntity name="ESBPreActionSmooksTransformer101"/> + <XChildEntity name="ESBPreActionMessagePersister120"/> + <XChildEntity name="ESBPreActionXStreamToObject101"/> + <XChildEntity name="ESBPreActionCommandInterpreter101"/> + <XChildEntity name="ESBPreActionBpmProcessor120"/> + <XChildEntity name="ESBPreActionScripting120"/> + <XChildEntity name="ESBPreActionGroovyProcessor101"/> + <XChildEntity name="ESBPreActionEJBProcessor120"/> + <XChildEntity name="ESBPreActionAggregator120"/> + <XChildEntity name="ESBPreActionContentBasedRouter120"/> + <XChildEntity name="ESBPreActionEchoRouter120"/> + <XChildEntity name="ESBPreActionStaticRouter101"/> + <XChildEntity name="ESBPreActionStaticWiretap101"/> + <XChildEntity name="ESBPreActionSyncServiceInvoker120"/> + <XChildEntity name="ESBPreActionJMSRouter120"/> + <XChildEntity name="ESBPreActionEMailRouter120"/> + <XChildEntity name="ESBPreActionEMailWiretap120"/> + <XChildEntity name="ESBPreActionHTTPRouter120"/> + <XChildEntity name="ESBPreActionSOAPProcessor101"/> + <XChildEntity name="ESBPreActionSOAPClient120"/> + <XChildEntity name="ESBPreActionSOAPWiseClient120"/> + <XChildEntity name="ESBPreActionSOAPProxy120"/> + <XChildEntity name="ESBPreActionSystemPrintln101"/> + <XChildEntity name="ESBPreActionNotifier120"/> + <XChildEntity name="ESBPreActionBusinessRulesProcessor130"/> + <XChildEntity name="ESBPreActionXSLTAction120"/> + <XChildEntity name="ESBPreActionSchemaValidator120"/> + </XChildrenEntities> + <XActionItem kind="list"> + <XActionItem ICON="action.empty" displayName="New" group="1" + kind="list" name="CreateActions"> + <XActionItem displayName="Add Pre-Packed Action" kind="list" name="PrePackedAction"> + <XActionItem displayName="BPM" group="1" kind="list" name="BPM"> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="BPM Processor..." kind="action" name="AddBPMProcessor"> + <EntityData EntityName="ESBPreActionBpmProcessor120"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="command"/> + <AttributeData AttributeName="process definition name" Mandatory="no"/> + <AttributeData AttributeName="process definition id" Mandatory="no"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Business Rules Processor..." kind="action" name="AddBusinessRulesProcessor"> + <EntityData EntityName="ESBPreActionBusinessRulesProcessor130"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="process" Mandatory="no"/> + <AttributeData AttributeName="rule set" Mandatory="no"/> + <AttributeData AttributeName="rule agent properties" Mandatory="no"/> + </EntityData> + </XActionItem> + </XActionItem> + <XActionItem displayName="Converters/Transformers" group="1" + kind="list" name="Converters"> + <XActionItemReference entity="ESBActions101" name="AddByteArrayToString"/> + <XActionItemReference entity="ESBActions101" + name="AddCommandInterpreter" path="CreateActions/PrePackedAction/AddCommandInterpreter"/> + <XActionItemReference entity="ESBActions101" name="AddLongToDate"/> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Message Persister..." kind="action" name="AddMessagePersister"> + <EntityData EntityName="ESBPreActionMessagePersister120"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="message store class"/> + <AttributeData AttributeName="classification" Mandatory="no"/> + <AttributeData AttributeName="terminal" Mandatory="no"/> + </EntityData> + </XActionItem> + <XActionItemReference entity="ESBActions101" + name="AddObjectInvoke" path="CreateActions/PrePackedAction/AddObjectInvoke"/> + <XActionItemReference entity="ESBActions101" name="AddObjectToCSVString"/> + <XActionItemReference entity="ESBActions101" name="AddObjectToXStream"/> + <XActionItemReference entity="ESBActions101" name="AddSmooksAction"/> + <XActionItemReference entity="ESBActions101" name="AddXStreamToObject"/> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="XSLT Action..." kind="action" name="AddXSLTAction"> + <EntityData EntityName="ESBPreActionXSLTAction120"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="template file"/> + <AttributeData AttributeName="get payload location" Mandatory="no"/> + <AttributeData AttributeName="set payload location" Mandatory="no"/> + <AttributeData AttributeName="result type" Mandatory="no"/> + </EntityData> + </XActionItem> + </XActionItem> + <XActionItem displayName="Miscellaneous" group="1" kind="list" name="Miscellaneous"> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="System Println..." kind="action" name="AddSystemPrintln"> + <EntityData EntityName="ESBPreActionSystemPrintln101"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="message"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Schema Validation..." kind="action" name="AddSchemaValidation"> + <EntityData EntityName="ESBPreActionSchemaValidator120"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="schema"/> + <AttributeData AttributeName="schema language" Mandatory="no"/> + </EntityData> + </XActionItem> + </XActionItem> + <XActionItem displayName="Routers" group="1" kind="list" name="Routers"> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Aggregator..." kind="action" name="AddAggregator"> + <EntityData EntityName="ESBPreActionAggregator120"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="timeout in millis" Mandatory="no"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%SpecialWizard%" + ICON="action.empty" + PROPERTIES="validator.add=true;support=org.jboss.tools.esb.core.model.handlers.AddContentBasedRouterSupport;cbrAlias=Drools;entity=ESBPreActionContentBasedRouter120" + displayName="Content Based Router (Drools)..." kind="action" name="AddContentBasedRouterDrools"> + <EntityData EntityName="ESBWizardDroolsRouter"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="process" Mandatory="no"/> + <AttributeData AttributeName="rule set"/> + <AttributeData AttributeName="rule language" Mandatory="no"/> + <AttributeData AttributeName="rule reload" Mandatory="no"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%SpecialWizard%" + ICON="action.empty" + PROPERTIES="validator.add=true;support=org.jboss.tools.esb.core.model.handlers.AddContentBasedRouterSupport" + displayName="Content Based Router (Generic)..." kind="action" name="AddContentBasedRouter"> + <EntityData EntityName="ESBPreActionContentBasedRouter120"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="cbr alias"/> + <AttributeData AttributeName="process" Mandatory="no"/> + <AttributeData AttributeName="rule set" Mandatory="no"/> + <AttributeData AttributeName="rule language" Mandatory="no"/> + <AttributeData AttributeName="rule reload" Mandatory="no"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%SpecialWizard%" + ICON="action.empty" + PROPERTIES="validator.add=true;support=org.jboss.tools.esb.core.model.handlers.AddContentBasedRouterSupport;cbrAlias=Regex;entity=ESBPreActionContentBasedRouter120" + displayName="Content Based Router (Regex)..." kind="action" name="AddContentBasedRouterRegex"> + <EntityData EntityName="ESBWizardXPathRouter"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="process" Mandatory="no"/> + <AttributeData AttributeName="rule set" Mandatory="no"/> + <AttributeData AttributeName="rule reload" Mandatory="no"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%SpecialWizard%" + ICON="action.empty" + PROPERTIES="validator.add=true;support=org.jboss.tools.esb.core.model.handlers.AddContentBasedRouterSupport;cbrAlias=Xpath;entity=ESBPreActionContentBasedRouter120" + displayName="Content Based Router (XPath)..." kind="action" name="AddContentBasedRouterXPath"> + <EntityData EntityName="ESBWizardXPathRouter"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="process" Mandatory="no"/> + <AttributeData AttributeName="rule set" Mandatory="no"/> + <AttributeData AttributeName="rule reload" Mandatory="no"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Echo Router..." kind="action" name="AddEchoRouter"> + <EntityData EntityName="ESBPreActionEchoRouter120"> + <AttributeData AttributeName="name"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="EMail Router..." kind="action" name="AddEMailRouter"> + <EntityData EntityName="ESBPreActionEMailRouter120"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="from" Mandatory="no"/> + <AttributeData AttributeName="send to" Mandatory="no"/> + <AttributeData AttributeName="subject" Mandatory="no"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="EMail Wiretap..." kind="action" name="AddEMailWiretap"> + <EntityData EntityName="ESBPreActionEMailWiretap120"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="from" Mandatory="no"/> + <AttributeData AttributeName="send to" Mandatory="no"/> + <AttributeData AttributeName="subject" Mandatory="no"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="HTTP Router..." kind="action" name="AddHTTPRouter"> + <EntityData EntityName="ESBPreActionHTTPRouter120"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="endpoint url" Mandatory="no"/> + <AttributeData AttributeName="file" Mandatory="no"/> + <AttributeData AttributeName="method"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="JMS Router..." kind="action" name="AddJMSRouter"> + <EntityData EntityName="ESBPreActionJMSRouter120"> + <AttributeData AttributeName="name"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Notifier..." kind="action" name="AddNotifier"> + <EntityData EntityName="ESBPreActionNotifier120"> + <AttributeData AttributeName="name"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Static Router..." kind="action" name="AddStaticRouter"> + <EntityData EntityName="ESBPreActionStaticRouter101"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="process" Mandatory="no"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Static Wiretap..." kind="action" name="AddStaticWiretap"> + <EntityData EntityName="ESBPreActionStaticWiretap101"> + <AttributeData AttributeName="name"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Sync Service Invoker..." kind="action" name="AddSyncServiceInvoker"> + <EntityData EntityName="ESBPreActionSyncServiceInvoker120"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="service category"/> + <AttributeData AttributeName="service name"/> + </EntityData> + </XActionItem> + </XActionItem> + <XActionItem displayName="Scripting" group="1" kind="list" name="Scripting"> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Scripting..." kind="action" name="AddScripting"> + <EntityData EntityName="ESBPreActionScripting120"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="script"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Groovy Action Processor..." kind="action" name="AddGroovyProcessor"> + <EntityData EntityName="ESBPreActionGroovyProcessor101"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="script"/> + </EntityData> + </XActionItem> + </XActionItem> + <XActionItem displayName="Services" group="1" kind="list" name="Services"> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="EJB Processor..." kind="action" name="AddEJBProcessor"> + <EntityData EntityName="ESBPreActionEJBProcessor120"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="ejb3" Mandatory="no"/> + <AttributeData AttributeName="ejb name" Mandatory="no"/> + <AttributeData AttributeName="jndi name" Mandatory="no"/> + <AttributeData AttributeName="initial context factory" Mandatory="no"/> + <AttributeData AttributeName="provider url" Mandatory="no"/> + <AttributeData AttributeName="method" Mandatory="no"/> + </EntityData> + </XActionItem> + </XActionItem> + <XActionItem displayName="Webservices" group="1" kind="list" name="SOAP"> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="SOAP Processor..." kind="action" name="AddSOAPProcessor"> + <EntityData EntityName="ESBPreActionSOAPProcessor101"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="jbossws endpoint"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="SOAP Client..." kind="action" name="AddSOAPClient"> + <EntityData EntityName="ESBPreActionSOAPClient120"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="wsdl"/> + <AttributeData AttributeName="soap action"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="SOAP Proxy..." kind="action" name="AddSOAPProxy"> + <EntityData EntityName="ESBPreActionSOAPProxy120"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="wsdl"/> + <AttributeData AttributeName="endpoint url" Mandatory="no"/> + <AttributeData AttributeName="file" Mandatory="no"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="SOAP Wise Client..." kind="action" name="AddSOAPWiseClient"> + <EntityData EntityName="ESBPreActionSOAPWiseClient120"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="wsdl"/> + <AttributeData AttributeName="operation"/> + </EntityData> + </XActionItem> + </XActionItem> + </XActionItem> + </XActionItem> + </XActionItem> + </XEntityExtension> </XModelEntityGroup> Modified: trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb13.meta =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb13.meta 2010-08-11 14:39:58 UTC (rev 24047) +++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb13.meta 2010-08-11 14:40:07 UTC (rev 24048) @@ -17,6 +17,67 @@ </ICONS> <GlobalActions kind="list"/> <XModelEntity ImplementingClass="%ESB%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;saveDefault=false;children=%Ordered%" + XMLSUBPATH="actions" name="ESBActions130"> + <XChildrenEntities> + <XChildEntity name="ESBAction120"/> + </XChildrenEntities> + <XEntityRenderer> + <ICONS> + <ICON info="main.esb.actions" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="actions list" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general;id=true" + default="Actions" name="name" visibility="false"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttributeReference attributes="mep,in xsd,out xsd,fault xsd" + entity="ESBActions101" name="actionsA"/> + <XModelAttribute PROPERTIES="category=general" + name="request location" xmlname="requestLocation"/> + <XModelAttribute PROPERTIES="category=general" + name="response location" xmlname="responseLocation"/> + <XModelAttributeReference attributes="webservice,validate" + entity="ESBActions101" name="actionsB"/> + <XModelAttribute PROPERTIES="category=advanced" name="addressing" xmlname="addressing"> + <Constraint loader="ListString"> + <value/> + <value name="true"/> + <value name="false"/> + </Constraint> + <Editor name="ListString"/> + </XModelAttribute> + <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> + <Editor name="Note"/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItem displayName="New" group="1" kind="list" name="CreateActions"> + <XActionItem HandlerClassName="%SpecialWizard%" ICON="action.empty" + PROPERTIES="validator.add=true;support=org.jboss.tools.esb.core.model.handlers.AddGenericActionSupport" + displayName="Custom Action..." kind="action" name="AddAction"> + <EntityData EntityName="ESBAction120"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="class"/> + <AttributeData AttributeName="process" Mandatory="no"/> + </EntityData> + </XActionItem> + <XActionItem HIDE="always" + HandlerClassName="org.jboss.tools.common.meta.action.impl.handlers.ShowMenuHandler" + PROPERTIES="actionList=CreateActions" displayName="Action..." + kind="action" name="AddAnyAction"/> + </XActionItem> + <XActionItemReference entity="ESBActions101" name="CopyActions"/> + <XActionItemReference entity="ESBActions101" name="DeleteActions"/> + <XActionItemReference entity="ESBProperty" name="Properties"/> + </XActionItem> + <XDependencies/> + </XModelEntity> + <XModelEntity ImplementingClass="%ESB%" PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;children=%ESBOrdered%" XMLSUBPATH="camel-bus" name="ESBCamelBus130"> <XChildrenEntities> @@ -420,7 +481,7 @@ <XChildEntity maxCount="1" name="ESBSecurity101P" required="yes"/> <XChildEntity name="ESBProperty"/> <XChildEntity maxCount="1" name="ESBListeners130" required="yes"/> - <XChildEntity maxCount="1" name="ESBActions120" required="yes"/> + <XChildEntity maxCount="1" name="ESBActions130" required="yes"/> </XChildrenEntities> <XEntityRenderer> <ICONS> Modified: trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/ESBConstants.java =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/ESBConstants.java 2010-08-11 14:39:58 UTC (rev 24047) +++ trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/ESBConstants.java 2010-08-11 14:40:07 UTC (rev 24048) @@ -155,6 +155,7 @@ public String ENT_ESB_ACTIONS_101 = ENT_ESB_ACTIONS + SUFF_101; public String ENT_ESB_ACTIONS_110 = ENT_ESB_ACTIONS + SUFF_110; public String ENT_ESB_ACTIONS_120 = ENT_ESB_ACTIONS + SUFF_120; + public String ENT_ESB_ACTIONS_130 = ENT_ESB_ACTIONS + SUFF_130; public String ENT_ESB_ACTION = "ESBAction101"; //$NON-NLS-1$ public String ENT_ESB_ACTION_120 = "ESBAction120"; //$NON-NLS-1$ @@ -163,6 +164,7 @@ public String ENT_ESB_ROUTE_TO = "ESBPreRouteTo"; //$NON-NLS-1$ public String ENT_ESB_OBJECT_PATH = "ESBPreObjectPath"; //$NON-NLS-1$ + public String ENT_ESB_SEND_TO = "ESBPreSendTo"; //$NON-NLS-1$ public String ENT_ESB_NOTIFICATION = "ESBPreNotificationList"; //$NON-NLS-1$ public String ENT_ESB_NOTIFICATION_120 = ENT_ESB_NOTIFICATION + SUFF_120; Modified: trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/SpecificActionLoader.java =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/SpecificActionLoader.java 2010-08-11 14:39:58 UTC (rev 24047) +++ trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/SpecificActionLoader.java 2010-08-11 14:40:07 UTC (rev 24048) @@ -52,6 +52,7 @@ } propertyConverters.put("alias", ConverterConstants.ALIAS_CONVERTER); propertyConverters.put("route", ConverterConstants.ROUTE_CONVERTER); + propertyConverters.put("send", ConverterConstants.CHANNELS_CONVERTER); propertyConverters.put("path", ConverterConstants.OBJECT_PATHS_CONVERTER); propertyConverters.put("notification", ConverterConstants.NOTIFICATION_CONVERTER); propertyConverters.put("notification2", ConverterConstants.NOTIFICATION_CONVERTER_2); Modified: trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/ConverterConstants.java =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/ConverterConstants.java 2010-08-11 14:39:58 UTC (rev 24047) +++ trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/ConverterConstants.java 2010-08-11 14:40:07 UTC (rev 24048) @@ -70,4 +70,9 @@ String EJB_PARAM_ENTITY = "ESBPreEJBParam"; String EJB_PARAMS = "ejb-params"; IPropertyConverter EJB_PARAM_CONVERTER = new EJBParamConverter(EJB_PARAMS, EJB_PARAM_ENTITY); + + String SEND_TO_ENTITY = "ESBPreSendTo"; + String CHANNELS = "channels"; + IPropertyConverter CHANNELS_CONVERTER = new BasicListConverter(CHANNELS, SEND_TO_ENTITY); + }

15 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r24047 - in trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core: src/org/jboss/tools/deltacloud/core and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: jjohnstn Date: 2010-08-11 10:39:58 -0400 (Wed, 11 Aug 2010) New Revision: 24047 Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudInstance.java Log: 2010-08-11 Jeff Johnston <jjohnstn(a)redhat.com> * src/org/jboss/tools/deltacloud/core/DeltaCloud.java (getInstances): Make instances a private field instead of local to the method. (refreshInstance): New method. (createInstance): Add notification to IInstanceListListeners. * src/org/jboss/tools/deltacloud/core/DeltaCloudInstance.java: Add static strings for the various states. Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog 2010-08-11 14:36:49 UTC (rev 24046) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog 2010-08-11 14:39:58 UTC (rev 24047) @@ -1,3 +1,12 @@ +2010-08-11 Jeff Johnston <jjohnstn(a)redhat.com> + + * src/org/jboss/tools/deltacloud/core/DeltaCloud.java (getInstances): Make + instances a private field instead of local to the method. + (refreshInstance): New method. + (createInstance): Add notification to IInstanceListListeners. + * src/org/jboss/tools/deltacloud/core/DeltaCloudInstance.java: Add static + strings for the various states. + 2010-08-09 Jeff Johnston <jjohnstn(a)redhat.com> * src/org/jboss/tools/deltacloud/core/DeltaCloudInstance.java (getHostName): New method. Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java 2010-08-11 14:36:49 UTC (rev 24046) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java 2010-08-11 14:39:58 UTC (rev 24047) @@ -21,8 +21,8 @@ private String username; private URL url; private DeltaCloudClient client; + private ArrayList<DeltaCloudInstance> instances; - ListenerList instanceListeners = new ListenerList(); ListenerList imageListeners = new ListenerList(); @@ -74,7 +74,7 @@ } public DeltaCloudInstance[] getInstances() { - ArrayList<DeltaCloudInstance> instances = new ArrayList<DeltaCloudInstance>(); + instances = new ArrayList<DeltaCloudInstance>(); try { List<Instance> list = client.listInstances(); for (Iterator<Instance> i = list.iterator(); i.hasNext();) { @@ -89,6 +89,18 @@ notifyInstanceListListeners(instanceArray); return instanceArray; } + + public DeltaCloudInstance refreshInstance(String instanceId) { + DeltaCloudInstance retVal = null; + try { + Instance instance = client.listInstances(instanceId); + retVal = new DeltaCloudInstance(instance); + } catch (DeltaCloudClientException e) { + // do nothing and return null + } + return retVal; + } + public DeltaCloudHardwareProfile[] getProfiles() { ArrayList<DeltaCloudHardwareProfile> profiles = new ArrayList<DeltaCloudHardwareProfile>(); @@ -146,13 +158,20 @@ return realms.toArray(new DeltaCloudRealm[realms.size()]); } - public boolean createInstance(String name, String imageId, String realmId, String profileId) throws DeltaCloudException { + public DeltaCloudInstance createInstance(String name, String imageId, String realmId, String profileId) throws DeltaCloudException { try { - if (client.createInstance(imageId, profileId, realmId, name) != null) - return true; + Instance instance = client.createInstance(imageId, profileId, realmId, name); + if (instance != null) { + DeltaCloudInstance newInstance = new DeltaCloudInstance(instance); + instances.add(newInstance); + DeltaCloudInstance[] instanceArray = new DeltaCloudInstance[instances.size()]; + instanceArray = instances.toArray(instanceArray); + notifyInstanceListListeners(instanceArray); + return newInstance; + } } catch (DeltaCloudClientException e) { throw new DeltaCloudException(e); } - return false; + return null; } } Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudInstance.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudInstance.java 2010-08-11 14:36:49 UTC (rev 24046) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudInstance.java 2010-08-11 14:39:58 UTC (rev 24047) @@ -7,6 +7,10 @@ public class DeltaCloudInstance { + public final static String PENDING = Instance.State.PENDING.toString(); + public final static String RUNNING = Instance.State.RUNNING.toString(); + public final static String STOPPED = Instance.State.STOPPED.toString(); + private Instance instance; public DeltaCloudInstance(Instance instance) {

15 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r24046 - in trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui: src/org/jboss/tools/deltacloud/ui/views and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: jjohnstn Date: 2010-08-11 10:36:49 -0400 (Wed, 11 Aug 2010) New Revision: 24046 Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/build.properties trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVMessages.properties trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/DeltaCloudView.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceComparator.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceView.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstance.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/WizardMessages.properties Log: 2010-08-11 Jeff Johnston <jjohnstn(a)redhat.com> * build.properties: Add plugin.properties to bin list. * src/org/jboss/tools/deltacloud/ui/views/CVMessages.properties: New messages. * src/org/jboss/tools/deltacloud/ui/views/DeltaCloudView.java (fillContextMenu): Remove all context actions for Instances for the time-being. * src/org/jboss/tools/deltacloud/ui/views/InstanceComparator.java: Remove unused DOWN constant. * src/org/jboss/tools/deltacloud/ui/views/InstanceView.java (listChanged): New method. (.modifyText): Remove and add the Instance list listener for the current cloud. (createPartControl): Add this as InstanceListListener for current cloud. (InstanceView): Make InstanceView implement IInstanceListListener. * src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstance.java (performFinish): Add a confirmation dialog as well as use a busy indicator while waiting to confirm that the new Instance has started. * src/org/jboss/tools/internal/deltacloud/ui/wizards/WizardMessages.properties: New messages. Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-08-11 14:18:57 UTC (rev 24045) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-08-11 14:36:49 UTC (rev 24046) @@ -1,3 +1,20 @@ +2010-08-11 Jeff Johnston <jjohnstn(a)redhat.com> + + * build.properties: Add plugin.properties to bin list. + * src/org/jboss/tools/deltacloud/ui/views/CVMessages.properties: New messages. + * src/org/jboss/tools/deltacloud/ui/views/DeltaCloudView.java (fillContextMenu): Remove + all context actions for Instances for the time-being. + * src/org/jboss/tools/deltacloud/ui/views/InstanceComparator.java: Remove unused + DOWN constant. + * src/org/jboss/tools/deltacloud/ui/views/InstanceView.java (listChanged): New method. + (.modifyText): Remove and add the Instance list listener for the current cloud. + (createPartControl): Add this as InstanceListListener for current cloud. + (InstanceView): Make InstanceView implement IInstanceListListener. + * src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstance.java (performFinish): Add + a confirmation dialog as well as use a busy indicator while waiting to confirm that the + new Instance has started. + * src/org/jboss/tools/internal/deltacloud/ui/wizards/WizardMessages.properties: New messages. + 2010-08-09 Jeff Johnston <jjohnstn(a)redhat.com> * src/org/jboss/tools/deltacloud/ui/views/InstanceComparator.java: New file. Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/build.properties =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/build.properties 2010-08-11 14:18:57 UTC (rev 24045) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/build.properties 2010-08-11 14:36:49 UTC (rev 24046) @@ -4,4 +4,5 @@ META-INF/,\ .,\ icons/,\ - contexts.xml + contexts.xml,\ + plugin.properties Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVMessages.properties =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVMessages.properties 2010-08-11 14:18:57 UTC (rev 24045) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVMessages.properties 2010-08-11 14:36:49 UTC (rev 24046) @@ -21,6 +21,7 @@ RemoveCloud.label=Disconnect Cloud Refresh.label=Refresh View CreateInstance.label=Launch Instance +DeleteInstance.label=Delete Instance NAME=Name ID=ID Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/DeltaCloudView.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/DeltaCloudView.java 2010-08-11 14:18:57 UTC (rev 24045) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/DeltaCloudView.java 2010-08-11 14:36:49 UTC (rev 24046) @@ -130,9 +130,8 @@ private void fillContextMenu(IMenuManager manager) { if (selectedElement instanceof CVImageElement) { manager.add(createInstance); - } else { - manager.add(action1); - manager.add(action2); + } else if (selectedElement instanceof CVInstanceElement){ + //TODO: add meaningful actions here } // Other plug-ins can contribute there actions here manager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS)); Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceComparator.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceComparator.java 2010-08-11 14:18:57 UTC (rev 24045) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceComparator.java 2010-08-11 14:36:49 UTC (rev 24046) @@ -8,9 +8,7 @@ public class InstanceComparator extends ViewerComparator { private final static int UP = 1; - private final static int DOWN = -1; - - + private int column; private int direction; Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceView.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceView.java 2010-08-11 14:18:57 UTC (rev 24045) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceView.java 2010-08-11 14:36:49 UTC (rev 24046) @@ -21,7 +21,6 @@ import org.eclipse.swt.events.ModifyListener; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.events.TreeAdapter; import org.eclipse.swt.events.VerifyEvent; import org.eclipse.swt.events.VerifyListener; import org.eclipse.swt.layout.FormAttachment; @@ -41,8 +40,9 @@ import org.jboss.tools.deltacloud.core.DeltaCloudInstance; import org.jboss.tools.deltacloud.core.DeltaCloudManager; import org.jboss.tools.deltacloud.core.ICloudManagerListener; +import org.jboss.tools.deltacloud.core.IInstanceListListener; -public class InstanceView extends ViewPart implements ICloudManagerListener { +public class InstanceView extends ViewPart implements ICloudManagerListener, IInstanceListListener { private final static String CLOUD_SELECTOR_LABEL = "CloudSelector.label"; //$NON-NLS-1$ private TableViewer viewer; @@ -54,9 +54,10 @@ private DeltaCloud currCloud; private Action doubleClickAction; + private InstanceView parentView; public InstanceView() { - // TODO Auto-generated constructor stub + parentView = this; } private ModifyListener cloudModifyListener = new ModifyListener() { @@ -65,7 +66,10 @@ public void modifyText(ModifyEvent e) { int index = cloudSelector.getSelectionIndex(); currCloud = clouds[index]; + currCloud.removeInstanceListListener(parentView); viewer.setInput(currCloud); + currCloud.addInstanceListListener(parentView); + viewer.refresh(); } }; @@ -147,6 +151,7 @@ table.setSortDirection(SWT.UP); viewer.setInput(clouds[0]); + currCloud.addInstanceListListener(parentView); FormData f = new FormData(); f.top = new FormAttachment(0, 8); @@ -283,4 +288,12 @@ cloudSelector.addModifyListener(cloudModifyListener); } + @Override + public void listChanged(DeltaCloudInstance[] list) { + currCloud.removeInstanceListListener(parentView); + viewer.setInput(currCloud); + viewer.refresh(); + currCloud.addInstanceListListener(parentView); + } + } Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstance.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstance.java 2010-08-11 14:18:57 UTC (rev 24045) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstance.java 2010-08-11 14:36:49 UTC (rev 24046) @@ -3,16 +3,22 @@ import java.io.UnsupportedEncodingException; import java.net.URLEncoder; +import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.preferences.InstanceScope; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.ErrorDialog; import org.eclipse.jface.dialogs.MessageDialogWithToggle; +import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.jface.wizard.Wizard; +import org.eclipse.ui.IWorkbench; +import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.progress.IProgressService; import org.jboss.tools.deltacloud.core.DeltaCloud; import org.jboss.tools.deltacloud.core.DeltaCloudException; import org.jboss.tools.deltacloud.core.DeltaCloudImage; +import org.jboss.tools.deltacloud.core.DeltaCloudInstance; import org.jboss.tools.deltacloud.ui.Activator; import org.jboss.tools.deltacloud.ui.IDeltaCloudPreferenceConstants; import org.osgi.service.prefs.Preferences; @@ -25,11 +31,13 @@ private final static String CONFIRM_CREATE_TITLE = "ConfirmCreate.title"; //$NON-NLS-1$ private final static String CONFIRM_CREATE_MSG = "ConfirmCreate.msg"; //$NON-NLS-1$ private final static String DONT_SHOW_THIS_AGAIN_MSG = "DontShowThisAgain.msg"; //$NON-NLS-1$ + private final static String STARTING_INSTANCE_MSG = "StartingInstance.msg"; //$NON-NLS-1$ private NewInstancePage mainPage; private DeltaCloud cloud; private DeltaCloudImage image; + private DeltaCloudInstance instance; public NewInstance(DeltaCloud cloud, DeltaCloudImage image) { this.cloud = cloud; @@ -81,7 +89,34 @@ prefs.putBoolean(IDeltaCloudPreferenceConstants.DONT_CONFIRM_CREATE_INSTANCE, true); } } - result = cloud.createInstance(name, imageId, realmId, profileId); + instance = cloud.createInstance(name, imageId, realmId, profileId); + if (instance != null) + result = true; + final String instanceId = instance.getId(); + final String instanceName = name; + if (instance != null) { + IWorkbench wb = PlatformUI.getWorkbench(); + IProgressService ps = wb.getProgressService(); + try { + ps.busyCursorWhile(new IRunnableWithProgress() { + public void run(IProgressMonitor pm) { + pm.beginTask(WizardMessages.getFormattedString(STARTING_INSTANCE_MSG, new String[] {instanceName}), IProgressMonitor.UNKNOWN); + pm.worked(1); + try { + for (int i = 0; i < 2; ++i) { + instance = cloud.refreshInstance(instanceId); + if (!instance.getState().equals(DeltaCloudInstance.PENDING)) + break; + } + } finally { + pm.done(); + } + } + }); + } catch(Exception ex) { + errorMessage = ex.getLocalizedMessage(); + } + } } catch (DeltaCloudException e) { errorMessage = e.getLocalizedMessage(); } Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/WizardMessages.properties =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/WizardMessages.properties 2010-08-11 14:18:57 UTC (rev 24045) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/WizardMessages.properties 2010-08-11 14:36:49 UTC (rev 24046) @@ -40,4 +40,6 @@ NewInstance.desc=Specify details for a new instance you wish to launch based on an image NewInstance.title=Launch Instance -NewInstance.name=Launch Instance \ No newline at end of file +NewInstance.name=Launch Instance + +StartingInstance.msg=Starting Instance: {0} \ No newline at end of file

15 years, 8 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits August 2010