You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by de...@apache.org on 2007/06/15 20:26:40 UTC
svn commit: r547760 - in /webservices/axis2/trunk/java/modules/kernel:
src/org/apache/axis2/deployment/
src/org/apache/axis2/deployment/repository/util/
test-resources/deployment/CustomDeployerRepo/
test/org/apache/axis2/deployment/
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: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org
Re: svn commit: r547760 - in /webservices/axis2/trunk/java/modules/kernel: src/org/apache/axis2/deployment/ src/org/apache/axis2/deployment/repository/util/ test-resources/deployment/CustomDeployerRepo/ test/org/apache/axis2/deployment/
Posted by Thilina Gunarathne <cs...@gmail.com>.
Jira-2626 is not about the *extension*... It is about "*HotUpdate*
failing on custom deployers".. Also on a side note, it would have
been really great if you sent a mail about this change, as this broke
the downstream projects which are using custom deployers..
You have also removed the workaround which I used to get the hotUpdate
working :(.. Now once again "HotUpdate" on custom deployers fails
miserably...
Thanks,
Thilina
On 6/15/07, deepal@apache.org <de...@apache.org> wrote:
> 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: axis-cvs-unsubscribe@ws.apache.org
> For additional commands, e-mail: axis-cvs-help@ws.apache.org
>
>
--
Thilina Gunarathne - http://www.wso2.com - http://thilinag.blogspot.com
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org
Re: svn commit: r547760 - in /webservices/axis2/trunk/java/modules/kernel: src/org/apache/axis2/deployment/ src/org/apache/axis2/deployment/repository/util/ test-resources/deployment/CustomDeployerRepo/ test/org/apache/axis2/deployment/
Posted by Thilina Gunarathne <cs...@gmail.com>.
Jira-2626 is not about the *extension*... It is about "*HotUpdate*
failing on custom deployers".. Also on a side note, it would have
been really great if you sent a mail about this change, as this broke
the downstream projects which are using custom deployers..
You have also removed the workaround which I used to get the hotUpdate
working :(.. Now once again "HotUpdate" on custom deployers fails
miserably...
Thanks,
Thilina
On 6/15/07, deepal@apache.org <de...@apache.org> wrote:
> 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: axis-cvs-unsubscribe@ws.apache.org
> For additional commands, e-mail: axis-cvs-help@ws.apache.org
>
>
--
Thilina Gunarathne - http://www.wso2.com - http://thilinag.blogspot.com
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org
Re: svn commit: r547760 - in /webservices/axis2/trunk/java/modules/kernel: src/org/apache/axis2/deployment/ src/org/apache/axis2/deployment/repository/util/ test-resources/deployment/CustomDeployerRepo/ test/org/apache/axis2/deployment/
Posted by Thilina Gunarathne <cs...@gmail.com>.
Jira-2626 is not about the *extension*... It is about "*HotUpdate*
failing on custom deployers".. Also on a side note, it would have
been really great if you sent a mail about this change, as this broke
the downstream projects which are using custom deployers..
You have also removed the workaround which I used to get the hotUpdate
working :(.. Now once again "HotUpdate" on custom deployers fails
miserably...
Thanks,
Thilina
On 6/15/07, deepal@apache.org <de...@apache.org> wrote:
> 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: axis-cvs-unsubscribe@ws.apache.org
> For additional commands, e-mail: axis-cvs-help@ws.apache.org
>
>
--
Thilina Gunarathne - http://www.wso2.com - http://thilinag.blogspot.com
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-dev-help@ws.apache.org