Repository: syncope Updated Branches: refs/heads/master 3981685ea -> b2fa0eb8b
Updating XMLNS for Syncope 2.1 Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/b2fa0eb8 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/b2fa0eb8 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/b2fa0eb8 Branch: refs/heads/master Commit: b2fa0eb8b122afd6b5a31135659e6e37242cad8a Parents: 3981685 Author: Francesco Chicchiriccò <ilgro...@apache.org> Authored: Tue Oct 3 18:03:59 2017 +0200 Committer: Francesco Chicchiriccò <ilgro...@apache.org> Committed: Tue Oct 3 18:03:59 2017 +0200 ---------------------------------------------------------------------- .../java/org/apache/syncope/common/lib/SyncopeConstants.java | 4 ++-- common/rest-api/pom.xml | 2 +- core/rest-cxf/pom.xml | 8 ++++---- core/rest-cxf/src/main/resources/META-INF/web-fragment.xml | 2 +- core/rest-cxf/src/main/resources/restCXFContext.xml | 6 +++--- .../src/main/resources/jboss/restCXFContext.xml | 6 +++--- 6 files changed, 14 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/b2fa0eb8/common/lib/src/main/java/org/apache/syncope/common/lib/SyncopeConstants.java ---------------------------------------------------------------------- diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/SyncopeConstants.java b/common/lib/src/main/java/org/apache/syncope/common/lib/SyncopeConstants.java index 9ce9b06..8419691 100644 --- a/common/lib/src/main/java/org/apache/syncope/common/lib/SyncopeConstants.java +++ b/common/lib/src/main/java/org/apache/syncope/common/lib/SyncopeConstants.java @@ -24,9 +24,9 @@ import java.util.regex.Pattern; public final class SyncopeConstants { - public static final String NS_PREFIX = "syncope2"; + public static final String NS_PREFIX = "syncope21"; - public static final String NS = "http://syncope.apache.org/2.0";; + public static final String NS = "http://syncope.apache.org/2.1";; public static final String MASTER_DOMAIN = "Master"; http://git-wip-us.apache.org/repos/asf/syncope/blob/b2fa0eb8/common/rest-api/pom.xml ---------------------------------------------------------------------- diff --git a/common/rest-api/pom.xml b/common/rest-api/pom.xml index 3ddbe91..7cedd7c 100644 --- a/common/rest-api/pom.xml +++ b/common/rest-api/pom.xml @@ -138,7 +138,7 @@ under the License. </goals> <configuration> <applicationTitle>Apache Syncope ${project.version}</applicationTitle> - <namespacePrefix>syncope2</namespacePrefix> + <namespacePrefix>syncope21</namespacePrefix> <incrementNamespacePrefix>false</incrementNamespacePrefix> <linkAnyMediaTypeToXmlSchema>true</linkAnyMediaTypeToXmlSchema> <useJaxbContextForQnames>true</useJaxbContextForQnames> http://git-wip-us.apache.org/repos/asf/syncope/blob/b2fa0eb8/core/rest-cxf/pom.xml ---------------------------------------------------------------------- diff --git a/core/rest-cxf/pom.xml b/core/rest-cxf/pom.xml index 51a854a..b0f1bf5 100644 --- a/core/rest-cxf/pom.xml +++ b/core/rest-cxf/pom.xml @@ -246,7 +246,7 @@ under the License. </parameter> <parameter> <name>schema-prefix</name> - <value>syncope2</value> + <value>syncope21</value> </parameter> </parameters> <outputProperties> @@ -258,7 +258,7 @@ under the License. <fileMappers> <fileMapper implementation="org.codehaus.plexus.components.io.filemappers.RegExpFileMapper"> <pattern>^.*$</pattern> - <replacement>schema_1_syncope2.html</replacement> + <replacement>schema_1_syncope21.html</replacement> </fileMapper> </fileMappers> </transformationSet> @@ -281,8 +281,8 @@ under the License. <replace file="${project.build.directory}/generated/wadl/index.html" token="../webjars/jquery-ui/$/jquery-ui.min.js" value="http://code.jquery.com/ui/${jquery-ui.version}/jquery-ui.min.js"; /> <replace file="${project.build.directory}/generated/wadl/index.html" token="../webjars/jquery-ui-themes/$/smoothness/jquery-ui.min.css" value="https://code.jquery.com/ui/${jquery-ui.version}/themes/smoothness/jquery-ui.css"; /> - <replace file="${project.build.directory}/generated/wadl/schema_1_syncope2.html" token="../webjars/highlightjs/$/highlight.min.js" value="http://cdnjs.cloudflare.com/ajax/libs/highlight.js/${highlightjs.version}/highlight.min.js"; /> - <replace file="${project.build.directory}/generated/wadl/schema_1_syncope2.html" token="../webjars/highlightjs/$/styles/default.min.css" value="http://cdnjs.cloudflare.com/ajax/libs/highlight.js/${highlightjs.version}/styles/default.min.css"; /> + <replace file="${project.build.directory}/generated/wadl/schema_1_syncope21.html" token="../webjars/highlightjs/$/highlight.min.js" value="http://cdnjs.cloudflare.com/ajax/libs/highlight.js/${highlightjs.version}/highlight.min.js"; /> + <replace file="${project.build.directory}/generated/wadl/schema_1_syncope21.html" token="../webjars/highlightjs/$/styles/default.min.css" value="http://cdnjs.cloudflare.com/ajax/libs/highlight.js/${highlightjs.version}/styles/default.min.css"; /> <copy todir="${site.deploymentBaseDir}/rest/2.0"> <fileset dir="${project.build.directory}/generated/wadl" /> http://git-wip-us.apache.org/repos/asf/syncope/blob/b2fa0eb8/core/rest-cxf/src/main/resources/META-INF/web-fragment.xml ---------------------------------------------------------------------- diff --git a/core/rest-cxf/src/main/resources/META-INF/web-fragment.xml b/core/rest-cxf/src/main/resources/META-INF/web-fragment.xml index 9e75b2d..024f211 100644 --- a/core/rest-cxf/src/main/resources/META-INF/web-fragment.xml +++ b/core/rest-cxf/src/main/resources/META-INF/web-fragment.xml @@ -45,7 +45,7 @@ under the License. <servlet-mapping> <servlet-name>WADLServlet</servlet-name> <url-pattern>/index.html</url-pattern> - <url-pattern>/schema_1_syncope2.html</url-pattern> + <url-pattern>/schema_1_syncope21.html</url-pattern> <url-pattern>/syncope.wadl</url-pattern> </servlet-mapping> http://git-wip-us.apache.org/repos/asf/syncope/blob/b2fa0eb8/core/rest-cxf/src/main/resources/restCXFContext.xml ---------------------------------------------------------------------- diff --git a/core/rest-cxf/src/main/resources/restCXFContext.xml b/core/rest-cxf/src/main/resources/restCXFContext.xml index d7251a7..1b2e17f 100644 --- a/core/rest-cxf/src/main/resources/restCXFContext.xml +++ b/core/rest-cxf/src/main/resources/restCXFContext.xml @@ -36,8 +36,8 @@ under the License. <bean id="jaxbProvider" class="org.apache.cxf.jaxrs.provider.JAXBElementProvider"> <property name="namespacePrefixes"> <map> - <entry key="http://syncope.apache.org/2.0";> - <value>syncope2</value> + <entry key="http://syncope.apache.org/2.1";> + <value>syncope21</value> </entry> </map> </property> @@ -88,7 +88,7 @@ under the License. <bean id="wadlGenerator" class="org.apache.syncope.core.rest.cxf.WadlGenerator"> <property name="applicationTitle" value="Apache Syncope ${syncope.version}"/> - <property name="namespacePrefix" value="syncope2"/> + <property name="namespacePrefix" value="syncope21"/> <property name="incrementNamespacePrefix" value="false"/> <property name="linkAnyMediaTypeToXmlSchema" value="true"/> <property name="useJaxbContextForQnames" value="true"/> http://git-wip-us.apache.org/repos/asf/syncope/blob/b2fa0eb8/fit/core-reference/src/main/resources/jboss/restCXFContext.xml ---------------------------------------------------------------------- diff --git a/fit/core-reference/src/main/resources/jboss/restCXFContext.xml b/fit/core-reference/src/main/resources/jboss/restCXFContext.xml index a59cbd6..51a2207 100644 --- a/fit/core-reference/src/main/resources/jboss/restCXFContext.xml +++ b/fit/core-reference/src/main/resources/jboss/restCXFContext.xml @@ -36,8 +36,8 @@ under the License. <bean id="jaxbProvider" class="org.apache.cxf.jaxrs.provider.JAXBElementProvider"> <property name="namespacePrefixes"> <map> - <entry key="http://syncope.apache.org/2.0";> - <value>syncope2</value> + <entry key="http://syncope.apache.org/2.1";> + <value>syncope21</value> </entry> </map> </property> @@ -88,7 +88,7 @@ under the License. <bean id="wadlGenerator" class="org.apache.syncope.core.rest.cxf.WadlGenerator"> <property name="applicationTitle" value="Apache Syncope ${syncope.version}"/> - <property name="namespacePrefix" value="syncope2"/> + <property name="namespacePrefix" value="syncope21"/> <property name="incrementNamespacePrefix" value="false"/> <property name="linkAnyMediaTypeToXmlSchema" value="true"/> <property name="useJaxbContextForQnames" value="true"/>
