Author: deepal
Date: Fri Jun 15 11:26:39 2007
New Revision: 547760
URL: http://svn.apache.org/viewvc?view=rev&rev=547760
Log:
fixing AXIS2-2626
now the extension is . (snt like .class)
Modified:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/DeploymentFileData.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/WSInfo.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/WSInfoList.java
webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/CustomDeployerRepo/axis2.xml
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/CustomDeployerTest.java
Modified:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java?view=diff&rev=547760&r1=547759&r2=547760
==============================================================================
---
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java
(original)
+++
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java
Fri Jun 15 11:26:39 2007
@@ -29,10 +29,8 @@
import java.net.URL;
import java.net.URLClassLoader;
import java.net.URLDecoder;
-import java.net.URI;
import java.util.HashMap;
import java.util.Iterator;
-import java.util.Enumeration;
public class RepositoryListener implements DeploymentConstants {
protected static final Log log =
LogFactory.getLog(RepositoryListener.class);
@@ -250,7 +248,6 @@
if (isSourceControlDir(file)) {
continue;
}
- // TODO: Should this allow expanded directories like
services/modules do?
if (!file.isDirectory() && extension.equals(
DeploymentFileData.getFileExtension(file.getName()))) {
addFileToDeploy(file,
Modified:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/DeploymentFileData.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/DeploymentFileData.java?view=diff&rev=547760&r1=547759&r2=547760
==============================================================================
---
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/DeploymentFileData.java
(original)
+++
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/DeploymentFileData.java
Fri Jun 15 11:26:39 2007
@@ -96,7 +96,7 @@
public static String getFileExtension(String fileName) {
int index = fileName.lastIndexOf('.');
- return fileName.substring(index + 1);
+ return fileName.substring(index);
}
public void setClassLoader(ClassLoader classLoader) {
Modified:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/WSInfo.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/WSInfo.java?view=diff&rev=547760&r1=547759&r2=547760
==============================================================================
---
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/WSInfo.java
(original)
+++
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/WSInfo.java
Fri Jun 15 11:26:39 2007
@@ -51,9 +51,9 @@
this.lastModifiedDate = lastModifiedDate;
this.deployer = deployer;
//TODO: This is a temporary fix for the hot update in custom deployers
- if (!(deployer instanceof ServiceDeployer)) {
- this.type=2;
- }
+// if (!(deployer instanceof ServiceDeployer)) {
+// this.type=2;
+// }
}
public String getFileName() {
Modified:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/WSInfoList.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/WSInfoList.java?view=diff&rev=547760&r1=547759&r2=547760
==============================================================================
---
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/WSInfoList.java
(original)
+++
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/WSInfoList.java
Fri Jun 15 11:26:39 2007
@@ -105,7 +105,7 @@
if (!currentJars.contains(itemName)) {
tempvector.add(fileitem);
WSInfo wsInfo = new WSInfo(fileitem.getFileName(),
fileitem.getLastModifiedDate());
- deploymentEngine.addWSToUndeploy(wsInfo); // this is to be
undeployed
+ deploymentEngine.addWSToUndeploy(wsInfo);
}
}
for (int i = 0; i < tempvector.size(); i++) {
Modified:
webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/CustomDeployerRepo/axis2.xml
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/CustomDeployerRepo/axis2.xml?view=diff&rev=547760&r1=547759&r2=547760
==============================================================================
---
webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/CustomDeployerRepo/axis2.xml
(original)
+++
webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/CustomDeployerRepo/axis2.xml
Fri Jun 15 11:26:39 2007
@@ -109,7 +109,7 @@
</messageFormatters>
<!-- Test custom deployment by registering for "svc" files, and the
"widgets" dir -->
- <deployer extension="svc" directory="widgets"
+ <deployer extension=".svc" directory="widgets"
class="org.apache.axis2.deployment.deployers.CustomDeployer"/>
<!-- ================================================= -->
Modified:
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/CustomDeployerTest.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/CustomDeployerTest.java?view=diff&rev=547760&r1=547759&r2=547760
==============================================================================
---
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/CustomDeployerTest.java
(original)
+++
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/CustomDeployerTest.java
Fri Jun 15 11:26:39 2007
@@ -32,7 +32,7 @@
// OK, let's see what we've got here...
assertTrue("Init was not called", CustomDeployer.initCalled);
assertEquals("Wrong directory", "widgets", CustomDeployer.directory);
- assertEquals("Wrong extension", "svc", CustomDeployer.extension);
+ assertEquals("Wrong extension", ".svc", CustomDeployer.extension);
assertEquals("Wrong number of deployed items", 2,
CustomDeployer.deployedItems);
assertTrue("George wasn't found", CustomDeployer.georgeDeployed);
assertTrue("Mary wasn't found", CustomDeployer.maryDeployed);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
