Commit e6394e25 authored by Jens Goldhammer's avatar Jens Goldhammer
Browse files

fixes(spring): use xml schema instead of dtd 

also increased xsd to spring version 3.0

fixes #429
parent 3031b401

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/src/main/resources/alfresco/module/__artifactId__/context/bootstrap-context.xml

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
<beans xmlns="http://www.springframework.org/schema/beans"

       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

       xsi:schemaLocation="http://www.springframework.org/schema/beans

          http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">

          http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">



    <!-- The bootstrap-context.xml file is used for patch definitions, importers, 

		 workflow, and loading custom content models.  -->

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/src/main/resources/alfresco/module/__artifactId__/context/service-context.xml

+4 −2
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
#set( $symbol_dollar = '$' )

#set( $symbol_escape = '\' )

<?xml version='1.0' encoding='UTF-8'?>

<!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>

<!--

	Licensed to the Apache Software Foundation (ASF) under one or more

	contributor license agreements.  See the NOTICE file distributed with
@@ -19,7 +18,10 @@ 
	See the License for the specific language governing permissions and

	limitations under the License.

-->

<beans>

<beans xmlns="http://www.springframework.org/schema/beans"

       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

       xsi:schemaLocation="http://www.springframework.org/schema/beans

          http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">

    

    <!-- A simple class that is initialized by Spring -->

    <bean id="${package}.exampleBean" class="${package}.platformsample.Demo" init-method="init" />

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/src/main/resources/alfresco/module/__artifactId__/context/webscript-context.xml

+4 −2
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
#set( $symbol_dollar = '$' )

#set( $symbol_escape = '\' )

<?xml version='1.0' encoding='UTF-8'?>

<!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>

<!--

	Licensed to the Apache Software Foundation (ASF) under one or more

	contributor license agreements.  See the NOTICE file distributed with
@@ -19,7 +18,10 @@ 
	See the License for the specific language governing permissions and

	limitations under the License.

-->

<beans>

<beans xmlns="http://www.springframework.org/schema/beans"

	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

	   xsi:schemaLocation="http://www.springframework.org/schema/beans

          http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">

	<bean id="webscript.alfresco.tutorials.helloworld.get"

		  class="${package}.platformsample.HelloWorldWebScript"

		  parent="webscript">

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/src/main/resources/alfresco/module/__artifactId__/module-context.xml

+5 −2
Original line number Diff line number Diff line
@@ -15,9 +15,12 @@ 
	limitations under the License.

	

-->

<!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>



<beans>

<beans xmlns="http://www.springframework.org/schema/beans"

       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

       xsi:schemaLocation="http://www.springframework.org/schema/beans

          http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">



	<!-- This is filtered by Maven at build time, so that module name is single sourced. -->

    <import resource="classpath:alfresco/module/${project.artifactId}/context/service-context.xml" />

    <import resource="classpath:alfresco/module/${project.artifactId}/context/bootstrap-context.xml" />

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-jar/src/main/resources/alfresco/web-extension/__artifactId__-slingshot-application-context.xml

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
<beans xmlns="http://www.springframework.org/schema/beans"

       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

       xsi:schemaLocation="http://www.springframework.org/schema/beans

                http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">

                http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">

   

   <!--

    Define beans related to this Share extension here, such as