[esb-java-dev] svn commit r23441 - in trunk/esb/java/modules: distribution distribution/src/main/assembly distribution/src/main/conf styles/src/main/resources/web/admin/css
ruwan at wso2.com
ruwan at wso2.com
Thu Nov 6 03:37:28 PST 2008
Author: ruwan
Date: Thu Nov 6 03:37:28 2008
New Revision: 23441
URL: http://wso2.org/svn/browse/wso2?view=rev&revision=23441
Log:
fixing the ESB distro
Modified:
trunk/esb/java/modules/distribution/pom.xml
trunk/esb/java/modules/distribution/src/main/assembly/bin.xml
trunk/esb/java/modules/distribution/src/main/conf/axis2.xml
trunk/esb/java/modules/styles/src/main/resources/web/admin/css/main.css
Modified: trunk/esb/java/modules/distribution/pom.xml
URL: http://wso2.org/svn/browse/wso2/trunk/esb/java/modules/distribution/pom.xml?rev=23441&r1=23440&r2=23441&view=diff
==============================================================================
--- trunk/esb/java/modules/distribution/pom.xml (original)
+++ trunk/esb/java/modules/distribution/pom.xml Thu Nov 6 03:37:28 2008
@@ -142,17 +142,17 @@
<version>SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.endpoint</artifactId>
- <version>SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.endpoint.ui</artifactId>
- <version>SNAPSHOT</version>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>org.wso2.carbon</groupId>-->
+ <!--<artifactId>org.wso2.carbon.endpoint</artifactId>-->
+ <!--<version>SNAPSHOT</version>-->
+ <!--</dependency>-->
+
+ <!--<dependency>-->
+ <!--<groupId>org.wso2.carbon</groupId>-->
+ <!--<artifactId>org.wso2.carbon.endpoint.ui</artifactId>-->
+ <!--<version>SNAPSHOT</version>-->
+ <!--</dependency>-->
<dependency>
<groupId>org.wso2.carbon</groupId>
Modified: trunk/esb/java/modules/distribution/src/main/assembly/bin.xml
URL: http://wso2.org/svn/browse/wso2/trunk/esb/java/modules/distribution/src/main/assembly/bin.xml?rev=23441&r1=23440&r2=23441&view=diff
==============================================================================
--- trunk/esb/java/modules/distribution/src/main/assembly/bin.xml (original)
+++ trunk/esb/java/modules/distribution/src/main/assembly/bin.xml Thu Nov 6 03:37:28 2008
@@ -54,8 +54,8 @@
<include>org.wso2.carbon:org.wso2.carbon.mediation.ui:jar</include>
<include>org.wso2.carbon:org.wso2.carbon.proxyadmin:jar</include>
<include>org.wso2.carbon:org.wso2.carbon.proxyadmin.ui:jar</include>
- <include>org.wso2.carbon:org.wso2.carbon.endpoint:jar</include>
- <include>org.wso2.carbon:org.wso2.carbon.endpoint.ui:jar</include>
+ <!--<include>org.wso2.carbon:org.wso2.carbon.endpoint:jar</include>-->
+ <!--<include>org.wso2.carbon:org.wso2.carbon.endpoint.ui:jar</include>-->
<include>org.wso2.carbon:org.wso2.carbon.localentry:jar</include>
<include>org.wso2.carbon:org.wso2.carbon.localentry.ui:jar</include>
@@ -92,30 +92,17 @@
<include>org.wso2.carbon:org.wso2.carbon.module.mgt:jar</include>
<include>org.wso2.carbon:org.wso2.carbon.module.mgt.ui:jar</include>
- <include>org.wso2.carbon:org.wso2.carbon.pojoservices.ui:jar</include>
- <include>org.wso2.carbon:org.wso2.carbon.springservices:jar</include>
- <include>org.wso2.carbon:org.wso2.carbon.springservices.ui:jar</include>
<include>org.wso2.carbon:org.wso2.carbon.spring.framework:jar</include>
<include>org.wso2.carbon:org.wso2.carbon.axis:jar</include>
- <include>org.wso2.carbon:org.wso2.carbon.axis1services:jar</include>
- <include>org.wso2.carbon:org.wso2.carbon.axis1services.ui:jar</include>
- <include>org.wso2.carbon:org.wso2.carbon.jaxws:jar</include>
- <include>org.wso2.carbon:org.wso2.carbon.jaxws.ui:jar</include>
<include>org.wso2.carbon:org.wso2.carbon.ui.menu.tools:jar</include>
<include>org.wso2.carbon:org.wso2.carbon.ui.menu.registry:jar</include>
- <include>org.wso2.carbon:org.wso2.carbon.ejbservices:jar</include>
- <include>org.wso2.carbon:org.wso2.carbon.ejbservices.ui:jar</include>
- <include>org.wso2.carbon:org.wso2.carbon.validator:jar</include>
- <include>org.wso2.carbon:org.wso2.carbon.validator.ui:jar</include>
- <include>org.wso2.carbon:org.wso2.carbon.wsdl2code:jar</include>
- <include>org.wso2.carbon:org.wso2.carbon.wsdl2code.ui:jar</include>
- <include>org.wso2.carbon:org.wso2.carbon.java2wsdl:jar</include>
- <include>org.wso2.carbon:org.wso2.carbon.java2wsdl.ui:jar</include>
- <include>org.wso2.carbon:org.wso2.carbon.wsdlcoonverter:jar</include>
- <include>org.wso2.carbon:org.wso2.carbon.wsdlcoonverter.ui:jar</include>
<include>org.wso2.carbon:org.wso2.carbon.policyeditor.ui:jar</include>
<include>org.wso2.carbon:org.wso2.carbon.policyeditor:jar</include>
+ <include>org.wso2.carbon:org.wso2.carbon.user.core:jar</include>
+ <include>org.wso2.carbon:org.wso2.carbon.user.mgt:jar</include>
+ <include>org.wso2.carbon:org.wso2.carbon.user.mgt.stub:jar</include>
+ <include>org.wso2.carbon:org.wso2.carbon.user.mgt.ui:jar</include>
</includes>
</dependencySet>
</dependencySets>
Modified: trunk/esb/java/modules/distribution/src/main/conf/axis2.xml
URL: http://wso2.org/svn/browse/wso2/trunk/esb/java/modules/distribution/src/main/conf/axis2.xml?rev=23441&r1=23440&r2=23441&view=diff
==============================================================================
--- trunk/esb/java/modules/distribution/src/main/conf/axis2.xml (original)
+++ trunk/esb/java/modules/distribution/src/main/conf/axis2.xml Thu Nov 6 03:37:28 2008
@@ -139,38 +139,68 @@
<!-- ================================================= -->
<!-- Transport Ins -->
<!-- ================================================= -->
+ <transportReceiver name="http"
+ class="org.wso2.carbon.core.transports.http.HttpTransportListener">
+ <!--
+ Uncomment the following if you are deploying this within an application server. You
+ need to specify the HTTP port of the application server
+ -->
+ <parameter name="port">9763</parameter>
+
+ <!--
+ Uncomment the following to enable Apache2 mod_proxy. The port on the Apache server is 80
+ in this case.
+ -->
+ <!--<parameter name="proxyPort">80</parameter>-->
+ </transportReceiver>
+
+ <transportReceiver name="https"
+ class="org.wso2.carbon.core.transports.http.HttpsTransportListener">
+ <!--
+ Uncomment the following if you are deploying this within an application server. You
+ need to specify the HTTPS port of the application server
+ -->
+ <parameter name="port">9443</parameter>
+
+ <!--
+ Uncomment the following to enable Apache2 mod_proxy. The port on the Apache server is 443
+ in this case.
+ -->
+ <!--<parameter name="proxyPort">443</parameter>-->
+ </transportReceiver>
+
<!-- the non blocking http transport based on HttpCore + NIO extensions -->
- <transportReceiver name="http" class="org.apache.synapse.transport.nhttp.HttpCoreNIOListener">
- <parameter name="port" locked="false">8280</parameter>
- <parameter name="non-blocking" locked="false">true</parameter>
+ <!--<transportReceiver name="http" class="org.apache.synapse.transport.nhttp.HttpCoreNIOListener">-->
+ <!--<parameter name="port" locked="false">8280</parameter>-->
+ <!--<parameter name="non-blocking" locked="false">true</parameter>-->
<!--parameter name="bind-address" locked="false">hostname or IP address</parameter-->
<!--parameter name="WSDLEPRPrefix" locked="false">https://apachehost:port/somepath</parameter-->
- </transportReceiver>
+ <!--</transportReceiver>-->
<!-- the non blocking https transport based on HttpCore + SSL-NIO extensions -->
- <transportReceiver name="https" class="org.apache.synapse.transport.nhttp.HttpCoreNIOSSLListener">
- <parameter name="port" locked="false">8243</parameter>
- <parameter name="non-blocking" locked="false">true</parameter>
+ <!--<transportReceiver name="https" class="org.apache.synapse.transport.nhttp.HttpCoreNIOSSLListener">-->
+ <!--<parameter name="port" locked="false">8243</parameter>-->
+ <!--<parameter name="non-blocking" locked="false">true</parameter>-->
<!--parameter name="bind-address" locked="false">hostname or IP address</parameter-->
<!--parameter name="WSDLEPRPrefix" locked="false">https://apachehost:port/somepath</parameter-->
- <parameter name="keystore" locked="false">
- <KeyStore>
- <Location>webapp/WEB-INF/classes/conf/identity.jks</Location>
- <Type>JKS</Type>
- <Password>password</Password>
- <KeyPassword>password</KeyPassword>
- </KeyStore>
- </parameter>
- <parameter name="truststore" locked="false">
- <TrustStore>
- <Location>webapp/WEB-INF/classes/conf/trust.jks</Location>
- <Type>JKS</Type>
- <Password>password</Password>
- </TrustStore>
- </parameter>
+ <!--<parameter name="keystore" locked="false">-->
+ <!--<KeyStore>-->
+ <!--<Location>webapp/WEB-INF/classes/conf/identity.jks</Location>-->
+ <!--<Type>JKS</Type>-->
+ <!--<Password>password</Password>-->
+ <!--<KeyPassword>password</KeyPassword>-->
+ <!--</KeyStore>-->
+ <!--</parameter>-->
+ <!--<parameter name="truststore" locked="false">-->
+ <!--<TrustStore>-->
+ <!--<Location>webapp/WEB-INF/classes/conf/trust.jks</Location>-->
+ <!--<Type>JKS</Type>-->
+ <!--<Password>password</Password>-->
+ <!--</TrustStore>-->
+ <!--</parameter>-->
<!--<parameter name="SSLVerifyClient">require</parameter>
supports optional|require or defaults to none -->
- </transportReceiver>
+ <!--</transportReceiver>-->
<transportReceiver name="vfs" class="org.apache.synapse.transport.vfs.VFSTransportListener"/>
Modified: trunk/esb/java/modules/styles/src/main/resources/web/admin/css/main.css
URL: http://wso2.org/svn/browse/wso2/trunk/esb/java/modules/styles/src/main/resources/web/admin/css/main.css?rev=23441&r1=23440&r2=23441&view=diff
==============================================================================
--- trunk/esb/java/modules/styles/src/main/resources/web/admin/css/main.css (original)
+++ trunk/esb/java/modules/styles/src/main/resources/web/admin/css/main.css Thu Nov 6 03:37:28 2008
@@ -1,3 +1,12 @@
+body {
+ background-color: white;
+ padding: 0px;
+ margin: 0px;
+ font-size: .8em;
+ font-size-adjust: none;
+ font-family: "Lucida Grande","Lucida Sans","Microsoft Sans Serif", "Lucida Sans Unicode","Verdana","Sans-serif","trebuchet ms";
+ color: #111;
+}
.cornerExpand {
position: relative;
top: 3px;
@@ -11,16 +20,6 @@
left: -12px;
cursor: pointer;
}
-
-body {
- background-color: white;
- padding: 0px;
- margin: 0px;
- font-family: "Lucida Grande","Lucida Sans","Microsoft Sans Serif", "Lucida Sans Unicode",verdana,sans-serif,"trebuchet ms";
- font-size: 70%;
- color: #111;
-}
-
input[type=text] {
font: 0.8em "Lucida Grande","Lucida Sans","Microsoft Sans Serif", "Lucida Sans Unicode",verdana,sans-serif,"trebuchet ms";
color: #111;
@@ -81,9 +80,9 @@
}
div#menu {
- margin-left: 15px;
- margin-right: 15px;
- width: 245px;
+ margin-left: 0px;
+ margin-right: 0px;
+ width: 275px;
}
/*div#menu div.menu-content {
@@ -116,11 +115,11 @@
}
div#menu ul.main li {
- border-bottom: solid 1px #f47b20;
- padding-bottom: 5px;
+ border-bottom: solid 0px #f47b20;
+ padding-bottom: 0px;
padding-top: 0px;
font-weight: bold;
- margin-top: 4px;
+ margin-top: 0px;
margin-left: 0px;
}
@@ -128,6 +127,7 @@
border-bottom: solid 0px #f47b20;
padding: 0px;
}
+/*
div#menu ul.main li.home {
background-image: url( ../../admin/images/menu_home.gif );
@@ -137,6 +137,16 @@
padding-left: 22px;
}
+div#menu ul.main li a.menu-default {
+ background-image: url( ../../admin/images/default-menu-icon.gif );
+ background-repeat: no-repeat;
+ background-position: left top;
+ height: 16px;
+ display: block;
+ width:223px;
+ padding-left: 22px;
+}
+
div#menu ul.main li.services {
background-image: url( ../../admin/images/menu_services.gif );
background-repeat: no-repeat;
@@ -276,20 +286,113 @@
margin-bottom: 0px;
padding-bottom: 5px;
color: #00447C;
+}*/
+div#menu ul.main li a.menu-default {
+ background-image: url( ../../admin/images/default-menu-icon.gif );
+ background-repeat: no-repeat;
+ background-position: 20px 7px;
+ background-color: #C1CEE9;
+ height: 15px;
+ display: block;
+ width:230px;
+ *width: 275px;
+ padding-left: 45px;
+ padding-top: 6px;
+ padding-bottom: 6px;
+ cursor: text;
+ border-bottom: solid 1px #94AFDA;
+ color: #333;
+}
+div#menu ul.main li.menu-header {
+ background-image: url( ../../admin/images/default-menu-icon.gif );
+ background-repeat: no-repeat;
+ background-position: 20px 7px;
+ background-color: #C1CEE9;
+ height: 15px;
+ display: block;
+ width:230px;
+ *width: 275px;
+ padding-left: 45px;
+ padding-top: 6px;
+ padding-bottom: 6px;
+ cursor: text;
+ border-bottom: solid 1px #94AFDA;
+ color: #333;
+}
+div#menu ul.main li a.menu-default:hover {
+ color: #333;
}
div#menu ul.sub {
- margin-left: 10px;
- padding-bottom: 2px;
- padding-top: 2px;
- *margin-top: -10px;
+ margin-left: 0px;
+ margin-top: 0px;
+ padding-bottom: 0px;
+ padding-top: 0px;
+ *margin-top: -15px;
}
div#menu ul.sub li {
border-bottom: 0px;
- padding-bottom: 5px;
+ padding-bottom: 0px;
font-weight: normal;
}
+div#menu ul.sub li a.menu-default {
+ background-image: url( ../../admin/images/default-menu-icon.gif );
+ background-repeat: no-repeat;
+ background-position: 36px 5px;
+ background-color: transparent;
+ height: 16px;
+ display: block;
+ width:214px;
+ *width: 275px;
+ padding-left: 61px;
+ padding-top: 5px;
+ padding-bottom: 5px;
+ border-bottom: 0px;
+ cursor: pointer;
+}
+div#menu ul.sub li a.menu-default:hover {
+ background-color: #F7F8FC;
+ color: #00447C;
+}
+div#menu ul.sub li.normal ul.sub li a.menu-default {
+ background-image: url( ../../admin/images/default-menu-icon.gif );
+ background-repeat: no-repeat;
+ background-position: 52px 5px;
+ background-color: transparent;
+ height: 16px;
+ display: block;
+ width:197px;
+ *width: 275px;
+ padding-left: 78px;
+ padding-top: 5px;
+ padding-bottom: 5px;
+ border-bottom: 0px;
+ cursor: pointer;
+}
+div#menu ul.sub li.normal ul.sub li a.menu-default:hover {
+ background-color: #F7F8FC;
+ color: #00447C;
+}
+div#menu ul.sub li.normal ul.sub li.normal ul.sub li a.menu-default {
+ background-image: url( ../../admin/images/default-menu-icon.gif );
+ background-repeat: no-repeat;
+ background-position: 68px 5px;
+ background-color: transparent;
+ height: 16px;
+ display: block;
+ width:181px;
+ *width: 275px;
+ padding-left: 94px;
+ padding-top: 5px;
+ padding-bottom: 5px;
+ border-bottom: 0px;
+ cursor: pointer;
+}
+div#menu ul.sub li.normal ul.sub li.normal ul.sub li a.menu-default:hover {
+ background-color: #F7F8FC;
+ color: #00447C;
+}
div#menu ul.sub li a {
text-decoration: none;
@@ -816,7 +919,7 @@
text-decoration:none;
}
-/*------------------------------ esb Stylesheet -------------------------------*/
+/*------------------------------ WSAS Stylesheet -------------------------------*/
/* Neutralize styling:
Elements we want to clean out entirely: */
@@ -1071,8 +1174,6 @@
/* Main content area
-------------------------------------------------------------------------- */
div#content {
- margin: 0 20px 0 220px;
- padding: 20px 0;
}
div#content h4{
@@ -1128,48 +1229,7 @@
text-align:justify;
}
- div#footer {
- padding-left: 10px;
- padding-top: 5px;
- padding-bottom:5px;
- height: 25px;
- _height: 25px;
- color: #fff;
- vertical-align: middle;
- background-color: #BFBFBF;
- }
-
- div#footer div.footer2 {
- padding-left: 10px;
- padding-top: 5px;
- padding-bottom:5px;
- height: 20px;
- _height: 20px;
- color: #fff;
- vertical-align: middle;
- background-color: #BFBFBF;
- float: left;
- }
-
- div#footer div.footer1 {
- height: 20px;
- _height: 20px;
- background-position: right center;
- background-repeat: no-repeat;
- background-attachment: scroll;
- padding-right: 14px;
- width: 100px;
- display: block;
- float: right;
- margin-right: 15px;
- padding-bottom:5px;
- }
-
- div#footer div.footer1 a img {
- border: 0px;
- }
-
- /* alert message box styles
+ /* alert message box styles
div#alertMessageBox {
color: #000;
border: #000 1px solid;
@@ -1546,6 +1606,7 @@
vertical-align: top;
text-align: left;
padding: 0px;
+ font-size: .9em;
}
table#main-table td#header {
@@ -1561,6 +1622,7 @@
background-repeat: no-repeat;
background-position: left top;
background-color: #EEF1F9;
+ padding-bottom: 20px;
}
td#menu table#menu-table {
@@ -1584,11 +1646,13 @@
table#main-table td#body {
padding-left: 20px;
+ padding-right: 20px;
padding-top: 15px;
}
table#main-table td#footer {
height: 30px;
+ background-color: #bfbfbf;
}
/* ---------------- header styles ------------------ */
@@ -1609,20 +1673,24 @@
float: left;
}
div#header div#right-logo {
- background-image: url( ../images/esb-console-logo.gif);
+ background-image: url( ../images/mgt-logo.gif);
background-repeat: repeat-x;
background-position: left top;
- height: 34px;
+ height: 44px;
float: right;
- width: 332px;
- display: none;
+ width: 196px;
+ margin-top: 5px;
}
div#header div#header-links {
- clear: right;
+ background-image: url( ../images/right-nav-bk.gif);
+ background-repeat: no-repeat;
+ background-position: right top;
float: right;
height: 30px;
width: 450px;
margin-top: 60px;
+ margin-right: -186px;
+ padding-top: 5px;
}
div#header-links ul#menu {
list-style: none;
@@ -1636,8 +1704,8 @@
div#header-links ul#menu li {
position: relative;
float: left;
- padding-left: 10px;
- padding-right: 10px;
+ padding-left: 5px;
+ padding-right: 5px;
padding-top: 0px;
padding-bottom: 0px;
margin: 0px;
@@ -1645,20 +1713,26 @@
/* ------------- footer styles -------------------- */
div#footer {
- height: 30px;
+ height: 35px;
+ width: 100%;
}
div#footer div#content {
- width: 360px;
- height: 30px;
+ width: 490px;
+ height: 35px;
margin: auto;
padding: 0px;
}
div#footer div#content div#copyright {
-
+ padding-top: 10px;
+ color: #fff;
+ width: 330px;
+ float: left;
}
div#footer div#content div#powerdedby {
- background-image: url( ../images/esb-poweredby-logo.gif);
- background-repeat: repeat-x;
- background-position: left top;
- display: none;
+ background-image: url( ../images/axis2-powered.gif);
+ background-repeat: no-repeat;
+ background-position: left 7px;
+ width: 127px;
+ height: 30px;
+ float: left;
}
\ No newline at end of file
More information about the Esb-java-dev
mailing list