Author: azeez
Date: Mon Dec 3 06:13:09 2007
New Revision: 10438
Log:
Merging 2.1 branch to trunk
Added:
trunk/commons/adminui/www/images/axis2-powered.gif
- copied unchanged from r10353,
branches/wsas/java/2.1/commons/adminui/www/images/axis2-powered.gif
Removed:
trunk/commons/adminui/www/faq.html
trunk/commons/adminui/www/images/powered-by-axis2.gif
Modified:
trunk/commons/adminui/pom.xml
trunk/commons/adminui/www/css/main.css
trunk/commons/adminui/www/images/navigation_bk.gif
trunk/commons/adminui/www/index.html
trunk/commons/adminui/www/js/main.js
Modified: trunk/commons/adminui/pom.xml
==============================================================================
--- trunk/commons/adminui/pom.xml (original)
+++ trunk/commons/adminui/pom.xml Mon Dec 3 06:13:09 2007
@@ -27,6 +27,19 @@
<version>2.2</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>2.0.3</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
</plugins>
</build>
@@ -131,6 +144,33 @@
</pluginRepositories>
+ <profiles>
+ <profile>
+ <activation>
+ <property>
+ <name>sign</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <version>1.0-alpha-3</version>
+ <executions>
+ <execution>
+ <id>sign-artifacts</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
<distributionManagement>
<repository>
Modified: trunk/commons/adminui/www/css/main.css
==============================================================================
--- trunk/commons/adminui/www/css/main.css (original)
+++ trunk/commons/adminui/www/css/main.css Mon Dec 3 06:13:09 2007
@@ -340,20 +340,22 @@
}
div#footer {
- padding-left: 20px;
+ padding-left: 10px;
padding-top: 5px;
- height: 30px;
- _height: 30px;
+ padding-bottom:5px;
+ height: 25px;
+ _height: 25px;
color: #fff;
vertical-align: middle;
background-color: #BFBFBF;
}
div#footer div.footer2 {
- padding-left: 20px;
+ padding-left: 10px;
padding-top: 5px;
- height: 25px;
- _height: 30px;
+ padding-bottom:5px;
+ height: 20px;
+ _height: 20px;
color: #fff;
vertical-align: middle;
background-color: #BFBFBF;
@@ -361,16 +363,17 @@
}
div#footer div.footer1 {
- height: 25px;
- _height: 30px;
+ height: 20px;
+ _height: 20px;
background-position: right center;
background-repeat: no-repeat;
background-attachment: scroll;
padding-right: 14px;
- width: 230px;
+ width: 100px;
display: block;
float: right;
margin-right: 15px;
+ padding-bottom:5px;
}
div#footer div.footer1 a img {
Modified: trunk/commons/adminui/www/images/navigation_bk.gif
==============================================================================
Binary files. No diff available.
Modified: trunk/commons/adminui/www/index.html
==============================================================================
--- trunk/commons/adminui/www/index.html (original)
+++ trunk/commons/adminui/www/index.html Mon Dec 3 06:13:09 2007
@@ -43,9 +43,8 @@
<!-- #######################################################################
-->
<!-- Place Holder for Javascript File References
-->
<!-- #######################################################################
-->
-<script language="javascript" src="js/main.js"></script>
-<script language="javascript" src="js/dhtmlHistory.js"></script>
-<script language="javascript" src="js/WSRequest.js"></script>
+<script language="javascript" src="js/all.js"></script>
+<script language="javascript" src="global_params.js"></script>
@js.file.items@
</head>
@@ -139,7 +138,7 @@
onclick="javascript:document.getElementById('alertMessageBox').style.display='none';return
false;"/></p>
</div>
<!-- end of the message box div -->
-<div id="footer"><div class="footer1"><a href="http://ws.apache.org/axis2/";
target="_blank"><img src="images/powered-by-axis2.gif"></img></a></div>
+<div id="footer"><div class="footer1"><a href="http://ws.apache.org/axis2/";
target="_blank"><img src="images/axis2-powered.gif"></img></a></div>
<div class="footer2">© 2007 WSO2 Inc.</div></div><!-- /footer -->
</div><!-- /wrapper -->
Modified: trunk/commons/adminui/www/js/main.js
==============================================================================
--- trunk/commons/adminui/www/js/main.js (original)
+++ trunk/commons/adminui/www/js/main.js Mon Dec 3 06:13:09 2007
@@ -189,22 +189,29 @@
}
return;
}
- if (error.reason.indexOf("Access Denied. Please login first") > -1) {
- if (typeof(stoppingRefreshingMethodsHook) != "undefined" &&
- typeof(logoutVisual) != "undefined") {
- stoppingRefreshingMethodsHook();
- logoutVisual();
+
+ if (error.reason != null) {
+ if (typeof (error.reason.indexOf) != "undefined") {
+ if (error.reason.indexOf("Access Denied. Please login first")
> -1) {
+ if (typeof(stoppingRefreshingMethodsHook) != "undefined" &&
+ typeof(logoutVisual) != "undefined") {
+ stoppingRefreshingMethodsHook();
+ logoutVisual();
+ }
+ }
}
}
-
- if (error.detail.indexOf("NS_ERROR_NOT_AVAILABLE") > -1) {
- if (typeof(stoppingRefreshingMethodsHook) != "undefined" &&
- typeof(logoutVisual) != "undefined") {
- stoppingRefreshingMethodsHook();
- logoutVisual();
+ if (error.detail != null) {
+ if (typeof (error.detail.indexOf) != "undefined") {
+ if (error.detail.indexOf("NS_ERROR_NOT_AVAILABLE") > -1) {
+ if (typeof(stoppingRefreshingMethodsHook) != "undefined" &&
+ typeof(logoutVisual) != "undefined") {
+ stoppingRefreshingMethodsHook();
+ logoutVisual();
+ }
+ }
}
-
}
wso2.wsf.Util.alertWarning(error.reason);
@@ -217,6 +224,7 @@
loadXMLDoc : function() {
try {
+ stopWaitAnimation(); /*This will stop the wait animation if
consecutive requests are made.*/
this.req = new WSRequest();
var loader = this;
if (this.req) {
@@ -547,6 +555,20 @@
new wso2.wsf.WSRequest(callURL, "urn:restart", bodyXML,
wso2.wsf.Util.restartServer["callback"]);
}
},
+
+/*
+ This method will restart the server gracefully.
+*/
+ restartServerGracefully : function (callbackFunction) {
+ var bodyXML = '<req:restartGracefullyRequest
xmlns:req="http://org.apache.axis2/xsd"/>\n';
+
+ var callURL = serverURL + "/" + ADMIN_SERVER_URL ;
+ if (callbackFunction && (typeof(callbackFunction) == "function")) {
+ new wso2.wsf.WSRequest(callURL, "urn:restartGracefully", bodyXML,
callbackFunction);
+ } else {
+ new wso2.wsf.WSRequest(callURL, "urn:restartGracefully", bodyXML,
wso2.wsf.Util.restartServerGracefully["callback"]);
+ }
+ },
/*
Trim the give string
*/
@@ -957,7 +979,7 @@
function finishLogin() {
//new one;
userNameString = "<nobr>Signed in as <strong>" + userName +
- "</strong> | <a id='logOutA'
href='#'
onclick='javascript:wso2.wsf.Util.logout(wso2.wsf.Util.logout[\"callback\"]);
return false;'>Sign Out</a> | <a
href='docs/administratorguide.html'
target='_blank'>Help</a> | <a href='docs/index_docs.html'
target='_blank'>Docs</a></nobr>";
+ "</strong> | <a href='about.html'
target='_blank'>About</a> | <a
href='docs/index_docs.html' target='_blank'>Docs</a> | <a
id='logOutA' href='#'
onclick='javascript:wso2.wsf.Util.logout(wso2.wsf.Util.logout[\"callback\"]);
return false;'>Sign Out</a></nobr>";
document.getElementById("meta").innerHTML = userNameString;
document.getElementById("navigation_general").style.display = "none";
document.getElementById("navigation_logged_in").style.display = "inline";
@@ -1023,7 +1045,16 @@
wso2.wsf.Util.restartServer["callback"] = function() {
logoutVisual();
stopWaitAnimation();
- wso2.wsf.Util.alertMessage("The server is being restarted. <br/> Please
login in a few seconds.");
+ wso2.wsf.Util.alertMessage("The server is being restarted. <br/> This will
take a few seconds. ");
+ // stopping all refressing methods
+ stoppingRefreshingMethodsHook();
+
+}
+
+wso2.wsf.Util.restartServerGracefully["callback"] = function() {
+ logoutVisual();
+ stopWaitAnimation();
+ wso2.wsf.Util.alertMessage("The server is being gracefully restarted.
<br/> This will take a few seconds. ");
// stopping all refressing methods
stoppingRefreshingMethodsHook();
@@ -1043,7 +1074,7 @@
//document.getElementById("userGreeting").style.display = "none";
document.getElementById("navigation_general").style.display = "inline";
document.getElementById("navigation_logged_in").style.display = "none";
- document.getElementById("meta").innerHTML = "<nobr><a id='logInA' href='#'
onclick='javascript:wsasLogin(); return false;'>Sign In</a></nobr>";
+ document.getElementById("meta").innerHTML = "<nobr><a href='about.html'
target='_blank'>About</a> | <a
href='docs/index_docs.html' target='_blank'>Docs</a> | <a
id='logInA' href='#' onclick='javascript:wsasLogin(); return false;'>Sign
In</a></nobr>";
if (typeof(showGeneralHome) != "undefined" && typeof(showGeneralHome) ==
"function") {
showLoginPage();
historyStorage.reset();
_______________________________________________
Commons-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/commons-dev
