You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2020/06/17 08:36:46 UTC
[shardingsphere-elastic-job-lite] branch master updated: Fix
Namespace URL error (#783) (#784)
This is an automated email from the ASF dual-hosted git repository.
zhangliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere-elastic-job-lite.git
The following commit(s) were added to refs/heads/master by this push:
new 9f32f91 Fix Namespace URL error (#783) (#784)
9f32f91 is described below
commit 9f32f918274e4374c4e2658bc521a7c492460d00
Author: Tboy <gu...@immomo.com>
AuthorDate: Wed Jun 17 16:36:39 2020 +0800
Fix Namespace URL error (#783) (#784)
---
.../src/main/resources/META-INF/namespace/job.xsd | 4 ++--
.../src/main/resources/META-INF/namespace/reg.xsd | 4 ++--
.../src/main/resources/META-INF/spring.handlers | 4 ++--
.../src/main/resources/META-INF/spring.schemas | 4 ++--
elastic-job-lite-spring/src/test/resources/META-INF/job/base.xml | 6 +++---
.../src/test/resources/META-INF/job/withEventTraceRdb.xml | 6 +++---
.../src/test/resources/META-INF/job/withJobProperties.xml | 6 +++---
.../src/test/resources/META-INF/job/withJobRef.xml | 6 +++---
.../src/test/resources/META-INF/job/withListener.xml | 6 +++---
.../src/test/resources/META-INF/job/withListenerAndCglib.xml | 6 +++---
.../resources/META-INF/job/withListenerAndJdkDynamicProxy.xml | 6 +++---
.../src/test/resources/META-INF/job/withoutListener.xml | 6 +++---
.../src/test/resources/META-INF/reg/regContext.xml | 8 ++++----
13 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/elastic-job-lite-spring/src/main/resources/META-INF/namespace/job.xsd b/elastic-job-lite-spring/src/main/resources/META-INF/namespace/job.xsd
index 45476f2..f452ff3 100644
--- a/elastic-job-lite-spring/src/main/resources/META-INF/namespace/job.xsd
+++ b/elastic-job-lite-spring/src/main/resources/META-INF/namespace/job.xsd
@@ -16,10 +16,10 @@
~ limitations under the License.
-->
-<xsd:schema xmlns="http://elaticjob.shardingsphere.apache.org/schema/job"
+<xsd:schema xmlns="http://elasticjob.shardingsphere.apache.org/schema/job"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:beans="http://www.springframework.org/schema/beans"
- targetNamespace="http://elaticjob.shardingsphere.apache.org/schema/job"
+ targetNamespace="http://elasticjob.shardingsphere.apache.org/schema/job"
elementFormDefault="qualified">
<xsd:import namespace="http://www.springframework.org/schema/beans"/>
diff --git a/elastic-job-lite-spring/src/main/resources/META-INF/namespace/reg.xsd b/elastic-job-lite-spring/src/main/resources/META-INF/namespace/reg.xsd
index 4b68f24..41badea 100644
--- a/elastic-job-lite-spring/src/main/resources/META-INF/namespace/reg.xsd
+++ b/elastic-job-lite-spring/src/main/resources/META-INF/namespace/reg.xsd
@@ -16,10 +16,10 @@
~ limitations under the License.
-->
-<xsd:schema xmlns="http://elaticjob.shardingsphere.apache.org/schema/reg"
+<xsd:schema xmlns="http://elasticjob.shardingsphere.apache.org/schema/reg"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:beans="http://www.springframework.org/schema/beans"
- targetNamespace="http://elaticjob.shardingsphere.apache.org/schema/reg"
+ targetNamespace="http://elasticjob.shardingsphere.apache.org/schema/reg"
elementFormDefault="qualified"
attributeFormDefault="unqualified">
<xsd:import namespace="http://www.springframework.org/schema/beans"/>
diff --git a/elastic-job-lite-spring/src/main/resources/META-INF/spring.handlers b/elastic-job-lite-spring/src/main/resources/META-INF/spring.handlers
index f14404d..b49817a 100644
--- a/elastic-job-lite-spring/src/main/resources/META-INF/spring.handlers
+++ b/elastic-job-lite-spring/src/main/resources/META-INF/spring.handlers
@@ -15,5 +15,5 @@
# limitations under the License.
#
-http\://elaticjob.shardingsphere.apache.org/schema/reg=org.apache.shardingsphere.elasticjob.lite.spring.reg.handler.RegNamespaceHandler
-http\://elaticjob.shardingsphere.apache.org/schema/job=org.apache.shardingsphere.elasticjob.lite.spring.job.handler.JobNamespaceHandler
+http\://elasticjob.shardingsphere.apache.org/schema/reg=org.apache.shardingsphere.elasticjob.lite.spring.reg.handler.RegNamespaceHandler
+http\://elasticjob.shardingsphere.apache.org/schema/job=org.apache.shardingsphere.elasticjob.lite.spring.job.handler.JobNamespaceHandler
diff --git a/elastic-job-lite-spring/src/main/resources/META-INF/spring.schemas b/elastic-job-lite-spring/src/main/resources/META-INF/spring.schemas
index 458c0d8..322a036 100644
--- a/elastic-job-lite-spring/src/main/resources/META-INF/spring.schemas
+++ b/elastic-job-lite-spring/src/main/resources/META-INF/spring.schemas
@@ -15,5 +15,5 @@
# limitations under the License.
#
-http\://elaticjob.shardingsphere.apache.org/schema/reg/reg.xsd=META-INF/namespace/reg.xsd
-http\://elaticjob.shardingsphere.apache.org/schema/job/job.xsd=META-INF/namespace/job.xsd
+http\://elasticjob.shardingsphere.apache.org/schema/reg/reg.xsd=META-INF/namespace/reg.xsd
+http\://elasticjob.shardingsphere.apache.org/schema/job/job.xsd=META-INF/namespace/job.xsd
diff --git a/elastic-job-lite-spring/src/test/resources/META-INF/job/base.xml b/elastic-job-lite-spring/src/test/resources/META-INF/job/base.xml
index 47d555e..f5377ac 100644
--- a/elastic-job-lite-spring/src/test/resources/META-INF/job/base.xml
+++ b/elastic-job-lite-spring/src/test/resources/META-INF/job/base.xml
@@ -19,13 +19,13 @@
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:context="http://www.springframework.org/schema/context"
- xmlns:reg="http://elaticjob.shardingsphere.apache.org/schema/reg"
+ xmlns:reg="http://elasticjob.shardingsphere.apache.org/schema/reg"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context.xsd
- http://elaticjob.shardingsphere.apache.org/schema/reg
- http://elaticjob.shardingsphere.apache.org/schema/reg/reg.xsd
+ http://elasticjob.shardingsphere.apache.org/schema/reg
+ http://elasticjob.shardingsphere.apache.org/schema/reg/reg.xsd
">
<context:property-placeholder location="classpath:conf/job/conf.properties" />
<reg:zookeeper id="regCenter" server-lists="${regCenter.serverLists}" namespace="${regCenter.namespace}" base-sleep-time-milliseconds="${regCenter.baseSleepTimeMilliseconds}"
diff --git a/elastic-job-lite-spring/src/test/resources/META-INF/job/withEventTraceRdb.xml b/elastic-job-lite-spring/src/test/resources/META-INF/job/withEventTraceRdb.xml
index 8faa115..1da1d90 100644
--- a/elastic-job-lite-spring/src/test/resources/META-INF/job/withEventTraceRdb.xml
+++ b/elastic-job-lite-spring/src/test/resources/META-INF/job/withEventTraceRdb.xml
@@ -18,11 +18,11 @@
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:job="http://elaticjob.shardingsphere.apache.org/schema/job"
+ xmlns:job="http://elasticjob.shardingsphere.apache.org/schema/job"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
- http://elaticjob.shardingsphere.apache.org/schema/job
- http://elaticjob.shardingsphere.apache.org/schema/job/job.xsd
+ http://elasticjob.shardingsphere.apache.org/schema/job
+ http://elasticjob.shardingsphere.apache.org/schema/job/job.xsd
">
<import resource="base.xml"/>
<job:simple id="simpleElasticJob_namespace_event_trace_rdb" class="org.apache.shardingsphere.elasticjob.lite.spring.fixture.job.FooSimpleElasticJob" registry-center-ref="regCenter"
diff --git a/elastic-job-lite-spring/src/test/resources/META-INF/job/withJobProperties.xml b/elastic-job-lite-spring/src/test/resources/META-INF/job/withJobProperties.xml
index 23990e8..84c6938 100644
--- a/elastic-job-lite-spring/src/test/resources/META-INF/job/withJobProperties.xml
+++ b/elastic-job-lite-spring/src/test/resources/META-INF/job/withJobProperties.xml
@@ -18,11 +18,11 @@
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:job="http://elaticjob.shardingsphere.apache.org/schema/job"
+ xmlns:job="http://elasticjob.shardingsphere.apache.org/schema/job"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
- http://elaticjob.shardingsphere.apache.org/schema/job
- http://elaticjob.shardingsphere.apache.org/schema/job/job.xsd
+ http://elasticjob.shardingsphere.apache.org/schema/job
+ http://elasticjob.shardingsphere.apache.org/schema/job/job.xsd
">
<import resource="base.xml"/>
<job:simple id="simpleElasticJob_namespace_job_properties" class="org.apache.shardingsphere.elasticjob.lite.spring.fixture.job.FooSimpleElasticJob"
diff --git a/elastic-job-lite-spring/src/test/resources/META-INF/job/withJobRef.xml b/elastic-job-lite-spring/src/test/resources/META-INF/job/withJobRef.xml
index 4978d84..fe051a3 100644
--- a/elastic-job-lite-spring/src/test/resources/META-INF/job/withJobRef.xml
+++ b/elastic-job-lite-spring/src/test/resources/META-INF/job/withJobRef.xml
@@ -18,11 +18,11 @@
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:job="http://elaticjob.shardingsphere.apache.org/schema/job"
+ xmlns:job="http://elasticjob.shardingsphere.apache.org/schema/job"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
- http://elaticjob.shardingsphere.apache.org/schema/job
- http://elaticjob.shardingsphere.apache.org/schema/job/job.xsd
+ http://elasticjob.shardingsphere.apache.org/schema/job
+ http://elasticjob.shardingsphere.apache.org/schema/job/job.xsd
">
<import resource="base.xml"/>
<bean id="refSimpleJob" class="org.apache.shardingsphere.elasticjob.lite.spring.fixture.job.ref.RefFooSimpleElasticJob">
diff --git a/elastic-job-lite-spring/src/test/resources/META-INF/job/withListener.xml b/elastic-job-lite-spring/src/test/resources/META-INF/job/withListener.xml
index 0f1540c..f0aaa91 100644
--- a/elastic-job-lite-spring/src/test/resources/META-INF/job/withListener.xml
+++ b/elastic-job-lite-spring/src/test/resources/META-INF/job/withListener.xml
@@ -18,11 +18,11 @@
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:job="http://elaticjob.shardingsphere.apache.org/schema/job"
+ xmlns:job="http://elasticjob.shardingsphere.apache.org/schema/job"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
- http://elaticjob.shardingsphere.apache.org/schema/job
- http://elaticjob.shardingsphere.apache.org/schema/job/job.xsd
+ http://elasticjob.shardingsphere.apache.org/schema/job
+ http://elasticjob.shardingsphere.apache.org/schema/job/job.xsd
">
<import resource="base.xml"/>
<job:simple id="${simpleJob.id}" class="${simpleJob.class}" registry-center-ref="regCenter" cron="${simpleJob.cron}" sharding-total-count="${simpleJob.shardingTotalCount}" sharding-item-parameters="${simpleJob.shardingItemParameters}" disabled="${simpleJob.disabled}" overwrite="${simpleJob.overwrite}">
diff --git a/elastic-job-lite-spring/src/test/resources/META-INF/job/withListenerAndCglib.xml b/elastic-job-lite-spring/src/test/resources/META-INF/job/withListenerAndCglib.xml
index 19f1124..b51f2ed 100644
--- a/elastic-job-lite-spring/src/test/resources/META-INF/job/withListenerAndCglib.xml
+++ b/elastic-job-lite-spring/src/test/resources/META-INF/job/withListenerAndCglib.xml
@@ -19,14 +19,14 @@
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:context="http://www.springframework.org/schema/context"
- xmlns:job="http://elaticjob.shardingsphere.apache.org/schema/job"
+ xmlns:job="http://elasticjob.shardingsphere.apache.org/schema/job"
xmlns:aop="http://www.springframework.org/schema/aop"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context.xsd
- http://elaticjob.shardingsphere.apache.org/schema/job
- http://elaticjob.shardingsphere.apache.org/schema/job/job.xsd
+ http://elasticjob.shardingsphere.apache.org/schema/job
+ http://elasticjob.shardingsphere.apache.org/schema/job/job.xsd
http://www.springframework.org/schema/aop
http://www.springframework.org/schema/aop/spring-aop.xsd
">
diff --git a/elastic-job-lite-spring/src/test/resources/META-INF/job/withListenerAndJdkDynamicProxy.xml b/elastic-job-lite-spring/src/test/resources/META-INF/job/withListenerAndJdkDynamicProxy.xml
index 5142d77..2e2c8a9 100644
--- a/elastic-job-lite-spring/src/test/resources/META-INF/job/withListenerAndJdkDynamicProxy.xml
+++ b/elastic-job-lite-spring/src/test/resources/META-INF/job/withListenerAndJdkDynamicProxy.xml
@@ -19,14 +19,14 @@
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:context="http://www.springframework.org/schema/context"
- xmlns:job="http://elaticjob.shardingsphere.apache.org/schema/job"
+ xmlns:job="http://elasticjob.shardingsphere.apache.org/schema/job"
xmlns:aop="http://www.springframework.org/schema/aop"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context.xsd
- http://elaticjob.shardingsphere.apache.org/schema/job
- http://elaticjob.shardingsphere.apache.org/schema/job/job.xsd
+ http://elasticjob.shardingsphere.apache.org/schema/job
+ http://elasticjob.shardingsphere.apache.org/schema/job/job.xsd
http://www.springframework.org/schema/aop
http://www.springframework.org/schema/aop/spring-aop.xsd
">
diff --git a/elastic-job-lite-spring/src/test/resources/META-INF/job/withoutListener.xml b/elastic-job-lite-spring/src/test/resources/META-INF/job/withoutListener.xml
index 11db513..1e2c867 100644
--- a/elastic-job-lite-spring/src/test/resources/META-INF/job/withoutListener.xml
+++ b/elastic-job-lite-spring/src/test/resources/META-INF/job/withoutListener.xml
@@ -18,11 +18,11 @@
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:job="http://elaticjob.shardingsphere.apache.org/schema/job"
+ xmlns:job="http://elasticjob.shardingsphere.apache.org/schema/job"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
- http://elaticjob.shardingsphere.apache.org/schema/job
- http://elaticjob.shardingsphere.apache.org/schema/job/job.xsd
+ http://elasticjob.shardingsphere.apache.org/schema/job
+ http://elasticjob.shardingsphere.apache.org/schema/job/job.xsd
">
<import resource="base.xml" />
<job:simple id="simpleElasticJob_namespace" class="org.apache.shardingsphere.elasticjob.lite.spring.fixture.job.FooSimpleElasticJob"
diff --git a/elastic-job-lite-spring/src/test/resources/META-INF/reg/regContext.xml b/elastic-job-lite-spring/src/test/resources/META-INF/reg/regContext.xml
index 8846f01..31d5a68 100644
--- a/elastic-job-lite-spring/src/test/resources/META-INF/reg/regContext.xml
+++ b/elastic-job-lite-spring/src/test/resources/META-INF/reg/regContext.xml
@@ -18,14 +18,14 @@
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:context="http://www.springframework.org/schema/context"
- xmlns:reg="http://elaticjob.shardingsphere.apache.org/schema/reg"
+ xmlns:context="http://www.springframework.org/schema/context"
+ xmlns:reg="http://elasticjob.shardingsphere.apache.org/schema/reg"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context.xsd
- http://elaticjob.shardingsphere.apache.org/schema/reg
- http://elaticjob.shardingsphere.apache.org/schema/reg/reg.xsd
+ http://elasticjob.shardingsphere.apache.org/schema/reg
+ http://elasticjob.shardingsphere.apache.org/schema/reg/reg.xsd
">
<context:property-placeholder location="classpath:conf/reg/conf.properties" ignore-unresolvable="true" />
<reg:zookeeper id="regCenter1" server-lists="${regCenter1.serverLists}" namespace="${regCenter1.namespace}" base-sleep-time-milliseconds="${regCenter1.baseSleepTimeMilliseconds}" max-sleep-time-milliseconds="${regCenter1.maxSleepTimeMilliseconds}" max-retries="${regCenter1.maxRetries}" />