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 ch...@apache.org on 2006/02/01 18:53:17 UTC
svn commit: r374123 - in /webservices/axis2/trunk/java:
etc/project.properties
modules/core/src/org/apache/axis2/engine/AxisConfiguration.java
Author: chinthaka
Date: Wed Feb 1 09:53:08 2006
New Revision: 374123
URL: http://svn.apache.org/viewcvs?rev=374123&view=rev
Log:
At last. There was a restriction with module deployment which disabled appending SNAPSHOT at the end of the name of that module. The restriction was that the name should end with a version number. This made modules to remove SNAPSOHOT from the name which in turn lead to the problem where maven didn't update them automatically even in a change. So fixed this in Axis2 so that now one can deploy a module with the word SNAPSHOT at the end.
Deepal, if possible please verify this. I don't know whether this is a hack. Its your call.
Modified:
webservices/axis2/trunk/java/etc/project.properties
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java
Modified: webservices/axis2/trunk/java/etc/project.properties
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/etc/project.properties?rev=374123&r1=374122&r2=374123&view=diff
==============================================================================
--- webservices/axis2/trunk/java/etc/project.properties (original)
+++ webservices/axis2/trunk/java/etc/project.properties Wed Feb 1 09:53:08 2006
@@ -21,7 +21,7 @@
version_number=0.95
version_affix=SNAPSHOT
axis2_version=${version_number}-${version_affix}
-addressing_version=${version_number}
+addressing_version=${version_number}-${version_affix}
security_version=${version_number}
# -------------------------------------------------------------------
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java?rev=374123&r1=374122&r2=374123&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java Wed Feb 1 09:53:08 2006
@@ -137,7 +137,15 @@
public void addModule(AxisModule module) throws AxisFault {
module.setParent(this);
notifyObservers(AxisEvent.MODULE_DEPLOY, module);
- allModules.put(module.getName(), module);
+
+ String moduleName = module.getName().getLocalPart();
+ if (moduleName.endsWith("SNAPSHOT")) {
+ QName moduleQName = new QName(moduleName.substring(0, moduleName.indexOf("SNAPSHOT") - 1));
+ module.setName(moduleQName);
+ allModules.put(moduleQName, module);
+ } else {
+ allModules.put(module.getName(), module);
+ }
}
/**
Re: svn commit: r374123 - in /webservices/axis2/trunk/java: etc/project.properties modules/core/src/org/apache/axis2/engine/AxisConfiguration.java
Posted by Deepal Jayasinghe <de...@opensource.lk>.
hmm , you have not completely done that (to take SNAPSOHOT a sdefault
version ), I will fix that :)
Thanks,
Deepal
................................................................
~Future is Open~
----- Original Message -----
From: <ch...@apache.org>
To: <ax...@ws.apache.org>
Sent: Wednesday, February 01, 2006 11:53 PM
Subject: svn commit: r374123 - in /webservices/axis2/trunk/java:
etc/project.properties
modules/core/src/org/apache/axis2/engine/AxisConfiguration.java
> Author: chinthaka
> Date: Wed Feb 1 09:53:08 2006
> New Revision: 374123
>
> URL: http://svn.apache.org/viewcvs?rev=374123&view=rev
> Log:
> At last. There was a restriction with module deployment which disabled
> appending SNAPSHOT at the end of the name of that module. The restriction
> was that the name should end with a version number. This made modules to
> remove SNAPSOHOT from the name which in turn lead to the problem where
> maven didn't update them automatically even in a change. So fixed this in
> Axis2 so that now one can deploy a module with the word SNAPSHOT at the
> end.
> Deepal, if possible please verify this. I don't know whether this is a
> hack. Its your call.
>
> Modified:
> webservices/axis2/trunk/java/etc/project.properties
>
> webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java
>
> Modified: webservices/axis2/trunk/java/etc/project.properties
> URL:
> http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/etc/project.properties?rev=374123&r1=374122&r2=374123&view=diff
> ==============================================================================
> --- webservices/axis2/trunk/java/etc/project.properties (original)
> +++ webservices/axis2/trunk/java/etc/project.properties Wed Feb 1
> 09:53:08 2006
> @@ -21,7 +21,7 @@
> version_number=0.95
> version_affix=SNAPSHOT
> axis2_version=${version_number}-${version_affix}
> -addressing_version=${version_number}
> +addressing_version=${version_number}-${version_affix}
> security_version=${version_number}
>
> # -------------------------------------------------------------------
>
> Modified:
> webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java
> URL:
> http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java?rev=374123&r1=374122&r2=374123&view=diff
> ==============================================================================
> ---
> webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java
> (original)
> +++
> webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java
> Wed Feb 1 09:53:08 2006
> @@ -137,7 +137,15 @@
> public void addModule(AxisModule module) throws AxisFault {
> module.setParent(this);
> notifyObservers(AxisEvent.MODULE_DEPLOY, module);
> - allModules.put(module.getName(), module);
> +
> + String moduleName = module.getName().getLocalPart();
> + if (moduleName.endsWith("SNAPSHOT")) {
> + QName moduleQName = new QName(moduleName.substring(0,
> moduleName.indexOf("SNAPSHOT") - 1));
> + module.setName(moduleQName);
> + allModules.put(moduleQName, module);
> + } else {
> + allModules.put(module.getName(), module);
> + }
> }
>
> /**
>
>
>
Re: svn commit: r374123 - in /webservices/axis2/trunk/java: etc/project.properties modules/core/src/org/apache/axis2/engine/AxisConfiguration.java
Posted by Deepal Jayasinghe <de...@opensource.lk>.
hmm , you have not completely done that (to take SNAPSOHOT a sdefault
version ), I will fix that :)
Thanks,
Deepal
................................................................
~Future is Open~
----- Original Message -----
From: <ch...@apache.org>
To: <ax...@ws.apache.org>
Sent: Wednesday, February 01, 2006 11:53 PM
Subject: svn commit: r374123 - in /webservices/axis2/trunk/java:
etc/project.properties
modules/core/src/org/apache/axis2/engine/AxisConfiguration.java
> Author: chinthaka
> Date: Wed Feb 1 09:53:08 2006
> New Revision: 374123
>
> URL: http://svn.apache.org/viewcvs?rev=374123&view=rev
> Log:
> At last. There was a restriction with module deployment which disabled
> appending SNAPSHOT at the end of the name of that module. The restriction
> was that the name should end with a version number. This made modules to
> remove SNAPSOHOT from the name which in turn lead to the problem where
> maven didn't update them automatically even in a change. So fixed this in
> Axis2 so that now one can deploy a module with the word SNAPSHOT at the
> end.
> Deepal, if possible please verify this. I don't know whether this is a
> hack. Its your call.
>
> Modified:
> webservices/axis2/trunk/java/etc/project.properties
>
> webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java
>
> Modified: webservices/axis2/trunk/java/etc/project.properties
> URL:
> http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/etc/project.properties?rev=374123&r1=374122&r2=374123&view=diff
> ==============================================================================
> --- webservices/axis2/trunk/java/etc/project.properties (original)
> +++ webservices/axis2/trunk/java/etc/project.properties Wed Feb 1
> 09:53:08 2006
> @@ -21,7 +21,7 @@
> version_number=0.95
> version_affix=SNAPSHOT
> axis2_version=${version_number}-${version_affix}
> -addressing_version=${version_number}
> +addressing_version=${version_number}-${version_affix}
> security_version=${version_number}
>
> # -------------------------------------------------------------------
>
> Modified:
> webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java
> URL:
> http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java?rev=374123&r1=374122&r2=374123&view=diff
> ==============================================================================
> ---
> webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java
> (original)
> +++
> webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java
> Wed Feb 1 09:53:08 2006
> @@ -137,7 +137,15 @@
> public void addModule(AxisModule module) throws AxisFault {
> module.setParent(this);
> notifyObservers(AxisEvent.MODULE_DEPLOY, module);
> - allModules.put(module.getName(), module);
> +
> + String moduleName = module.getName().getLocalPart();
> + if (moduleName.endsWith("SNAPSHOT")) {
> + QName moduleQName = new QName(moduleName.substring(0,
> moduleName.indexOf("SNAPSHOT") - 1));
> + module.setName(moduleQName);
> + allModules.put(moduleQName, module);
> + } else {
> + allModules.put(module.getName(), module);
> + }
> }
>
> /**
>
>
>