You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by sa...@apache.org on 2017/04/17 13:15:52 UTC
[1/3] ode git commit: Replace the web-console version in
urlrewrite.xml during the build
Repository: ode
Updated Branches:
refs/heads/ode-1.3.x 9c90ecaaf -> 676d0a8a5
Replace the web-console version in urlrewrite.xml during the build
Project: http://git-wip-us.apache.org/repos/asf/ode/repo
Commit: http://git-wip-us.apache.org/repos/asf/ode/commit/5aade74f
Tree: http://git-wip-us.apache.org/repos/asf/ode/tree/5aade74f
Diff: http://git-wip-us.apache.org/repos/asf/ode/diff/5aade74f
Branch: refs/heads/ode-1.3.x
Commit: 5aade74fc96ed50690e59e049c3f333f419f5524
Parents: 9c90eca
Author: sathwik <sa...@apache.org>
Authored: Mon Apr 17 12:09:53 2017 +0530
Committer: sathwik <sa...@apache.org>
Committed: Mon Apr 17 12:09:53 2017 +0530
----------------------------------------------------------------------
Rakefile | 9 +++++++++
axis2-war/src/main/webapp/WEB-INF/urlrewrite.xml | 2 +-
2 files changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ode/blob/5aade74f/Rakefile
----------------------------------------------------------------------
diff --git a/Rakefile b/Rakefile
index 141a0d2..8917c0e 100644
--- a/Rakefile
+++ b/Rakefile
@@ -120,6 +120,15 @@ define "ode" do
root.merge(artifact(AXIS2_WAR)).exclude("WEB-INF/*").exclude("META-INF/*")
end
+ #specify version of web console in urlrewrite.xml
+ build do
+ cp _("src/main/webapp/WEB-INF/urlrewrite.xml"), _(:target)
+ text = File.read(_(:target, "urlrewrite.xml"))
+ changed_text = text.gsub(/\$\{version\}/, artifact(ODE_WEB_CONSOLE).version)
+ File.open(_(:target, "urlrewrite.xml"),'w') {|f| f.puts changed_text}
+ package(:war).path("WEB-INF").include(_(:target, "urlrewrite.xml"))
+ end
+
task("start"=>[package(:war), jetty.use]) do |task|
class << task ; attr_accessor :url, :path ; end
task.url = "http://localhost:8080/ode"
http://git-wip-us.apache.org/repos/asf/ode/blob/5aade74f/axis2-war/src/main/webapp/WEB-INF/urlrewrite.xml
----------------------------------------------------------------------
diff --git a/axis2-war/src/main/webapp/WEB-INF/urlrewrite.xml b/axis2-war/src/main/webapp/WEB-INF/urlrewrite.xml
index 1562d93..b6fb06e 100644
--- a/axis2-war/src/main/webapp/WEB-INF/urlrewrite.xml
+++ b/axis2-war/src/main/webapp/WEB-INF/urlrewrite.xml
@@ -39,6 +39,6 @@
<condition type="request-uri" operator="notequal">/*/services/**</condition>
<condition type="request-uri" operator="notequal">/*/deployment/**</condition>
<from>/**</from>
- <to>/webjars/ode-console/0.1.0-SNAPSHOT/$1</to>
+ <to>/webjars/ode-console/${version}/$1</to>
</rule>
</urlrewrite>
[2/3] ode git commit: exclude old console that uses json.org,
due to licensing issues
Posted by sa...@apache.org.
exclude old console that uses json.org, due to licensing issues
Project: http://git-wip-us.apache.org/repos/asf/ode/repo
Commit: http://git-wip-us.apache.org/repos/asf/ode/commit/4ce6501e
Tree: http://git-wip-us.apache.org/repos/asf/ode/tree/4ce6501e
Diff: http://git-wip-us.apache.org/repos/asf/ode/diff/4ce6501e
Branch: refs/heads/ode-1.3.x
Commit: 4ce6501e8b41c35e3edc53e11d631069ae9b93ee
Parents: 5aade74
Author: sathwik <sa...@apache.org>
Authored: Mon Apr 17 18:31:27 2017 +0530
Committer: sathwik <sa...@apache.org>
Committed: Mon Apr 17 18:31:27 2017 +0530
----------------------------------------------------------------------
Rakefile | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ode/blob/4ce6501e/Rakefile
----------------------------------------------------------------------
diff --git a/Rakefile b/Rakefile
index 8917c0e..23988a4 100644
--- a/Rakefile
+++ b/Rakefile
@@ -109,6 +109,7 @@ define "ode" do
WOODSTOX, WSDL4J, WS_COMMONS, XALAN, XERCES, XMLBEANS, SPRING,
AXIS2_MODULES.libs, H2::REQUIRES, SLF4J, ODE_WEB_CONSOLE, TUCKEY_URLREWRITE
+
package(:war).with(:libs=>libs).path("WEB-INF").tap do |web_inf|
web_inf.merge project("dao-jpa-ojpa-derby").package(:zip)
web_inf.merge project("dao-hibernate-db").package(:zip)
@@ -116,9 +117,12 @@ define "ode" do
web_inf.include project("bpel-schemas").path_to("src/main/xsd/pmapi.xsd")
end
package(:war).path("WEB-INF/modules").include(artifacts(AXIS2_MODULES.mods))
- package(:war).tap do |root|
- root.merge(artifact(AXIS2_WAR)).exclude("WEB-INF/*").exclude("META-INF/*")
- end
+
+ #exlude old console that uses json.org, due to licensing issues
+ package(:war).exclude("css").exclude("images").exclude("js")
+ # package(:war).tap do |root|
+ # root.merge(artifact(AXIS2_WAR)).exclude("WEB-INF/*").exclude("META-INF/*")
+ # end
#specify version of web console in urlrewrite.xml
build do
@@ -861,6 +865,8 @@ define "apache-ode" do
else
zip.include Dir.pwd, :as=>"."
end
+ #exlude old console that uses json.org, due to licensing issues
+ zip.exclude('axis2-war/src/main/webapp/css').exclude('axis2-war/src/main/webapp/images').exclude('axis2-war/src/main/webapp/js')
end
package(:zip, :id=>"#{id}-docs").include(doc.from(project("ode").projects).
[3/3] ode git commit: revert VERSION for re-release
Posted by sa...@apache.org.
revert VERSION for re-release
Project: http://git-wip-us.apache.org/repos/asf/ode/repo
Commit: http://git-wip-us.apache.org/repos/asf/ode/commit/676d0a8a
Tree: http://git-wip-us.apache.org/repos/asf/ode/tree/676d0a8a
Diff: http://git-wip-us.apache.org/repos/asf/ode/diff/676d0a8a
Branch: refs/heads/ode-1.3.x
Commit: 676d0a8a5d5695d2b5b04ff4b7bb998c472ec399
Parents: 4ce6501
Author: sathwik <sa...@apache.org>
Authored: Mon Apr 17 18:35:08 2017 +0530
Committer: sathwik <sa...@apache.org>
Committed: Mon Apr 17 18:35:08 2017 +0530
----------------------------------------------------------------------
Rakefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ode/blob/676d0a8a/Rakefile
----------------------------------------------------------------------
diff --git a/Rakefile b/Rakefile
index 23988a4..f960018 100644
--- a/Rakefile
+++ b/Rakefile
@@ -40,7 +40,7 @@ Buildr::OpenJPA::REQUIRES[0] = "org.apache.openjpa:openjpa:jar:1.2.0"
Java.classpath << Buildr::OpenJPA::REQUIRES
# Keep this structure to allow the build system to update version numbers.
-VERSION_NUMBER = "1.3.8-SNAPSHOT"
+VERSION_NUMBER = "1.3.7-SNAPSHOT"
# if SNAPSHOT version...
if VERSION_NUMBER =~ /SNAPSHOT/