Skip to content

Commit e68b598

Browse files
thboileauthboileau
authored
Merge pull request restlet#1288 from restlet/2.4_build
2.4 build
2 parents 870af6d + 01ff2bc commit e68b598

File tree

116 files changed

+261
-437
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

116 files changed

+261
-437
lines changed

‎build/project.xml

+1-7
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
<distribution id="classic" />
1515
<distribution id="maven" />
1616
</distributions>
17-
<wikiUri>../editions/jse/</wikiUri>
1817
</edition>
1918
<edition id="jee">
2019
<label>
@@ -32,7 +31,6 @@
3231
<distribution id="classic" />
3332
<distribution id="maven" />
3433
</distributions>
35-
<wikiUri>../editions/jee/</wikiUri>
3634
</edition>
3735
<edition id="osgi">
3836
<label>
@@ -49,7 +47,6 @@
4947
<distribution id="maven" />
5048
<distribution id="p2" />
5149
</distributions>
52-
<wikiUri>../editions/osgi/</wikiUri>
5350
</edition>
5451
<edition id="gae">
5552
<label>
@@ -66,7 +63,6 @@
6663
<distribution id="classic" />
6764
<distribution id="maven" />
6865
</distributions>
69-
<wikiUri>../editions/gae/</wikiUri>
7066
</edition>
7167
<edition id="gwt">
7268
<label>
@@ -98,7 +94,6 @@
9894
<replace dir="${mod}/${module.package}" includes="**/.project" token="org.restlet.client" value="org.restlet.${edition}" />
9995
]]>
10096
</postSource>
101-
<wikiUri>../editions/gwt/</wikiUri>
10297
</edition>
10398
<edition id="android">
10499
<label>
@@ -116,6 +111,5 @@
116111
<distribution id="classic" />
117112
<distribution id="maven" />
118113
</distributions>
119-
<wikiUri>../editions/android/</wikiUri>
120114
</edition>
121-
</editions>
115+
</editions>

‎build/tmpl/editions/generate-sources.tmpl

+7-6
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,13 @@
66
</#noparse>
77
<#list edition.modules as module>
88
<!-- copy and filter the java source code -->
9-
<copy todir="<#noparse>${mod}</#noparse>/${module.package}" overwrite="true" includeEmptyDirs="false">
9+
<copy todir="<#noparse>${mod}</#noparse>/${module.package}/src" overwrite="true" includeEmptyDirs="false">
1010
<fileset dir="<#noparse>${mods}</#noparse>/${module.package}" excludes="bin/**">
1111
<#if module.source[editionKey]??>${module.source[editionKey].sets!""}</#if>
12-
<include name="**/*.java" />
12+
<include name="src/main/java/**/*.java" />
13+
<include name="src/main/${editionKey}/**/*.java" />
1314
</fileset>
14-
<#if (module.source[editionKey]??) && (module.source[editionKey].mappers??)><chainedmapper>${module.source[editionKey].mappers}</chainedmapper></#if>
15+
<chainedmapper><cutdirsmapper dirs="3"/><#if (module.source[editionKey]??) && (module.source[editionKey].mappers??)>${module.source[editionKey].mappers}</#if></chainedmapper>
1516
<filterchain>
1617
<filterreader classname="filter.EditionFilterReader" classpathref="forge-path">
1718
<param name="edition" value="${editionKey}" />
@@ -20,8 +21,8 @@
2021
</filterchain>
2122
</copy>
2223
<!-- copy and filter the non Java code -->
23-
<copy todir="<#noparse>${mod}</#noparse>/${module.package}" overwrite="true" includeEmptyDirs="false">
24-
<fileset dir="<#noparse>${mods}</#noparse>/${module.package}" excludes="bin/**">
24+
<copy todir="<#noparse>${mod}</#noparse>/${module.package}/src" overwrite="true" includeEmptyDirs="false">
25+
<fileset dir="<#noparse>${mods}</#noparse>/${module.package}" includes="src/main/java/**/*,src/main/resources/**/*,src/main/${editionKey}/**/*" excludes="bin/**">
2526
<#compress>
2627
<#list editions?keys as ed>
2728
<#if ed != edition.id><exclude name="**/*.${ed}*" /></#if>
@@ -30,7 +31,7 @@
3031
<#if module.source[editionKey]??>${module.source[editionKey].sets!""}</#if>
3132
<exclude name="**/*.java" />
3233
</fileset>
33-
<#if (module.source[editionKey]??) && (module.source[editionKey].mappers??)><chainedmapper>${module.source[editionKey].mappers}</chainedmapper></#if>
34+
<chainedmapper><cutdirsmapper dirs="3"/><#if (module.source[editionKey]??) && (module.source[editionKey].mappers??)>${module.source[editionKey].mappers}</#if></chainedmapper>
3435
<#if (module.source[editionKey]??) && (module.source[editionKey].filters??)><filterchain>${module.source[editionKey].filters}</filterchain></#if>
3536
</copy>
3637
<#if module.primaryLibrary??>

‎modules/org.restlet.example.book.restlet.ch08.gae/src/META-INF/jdoconfig.xml renamed to ‎modules/org.restlet.example.book.restlet.ch08.gae/src/main/resources/META-INF/jdoconfig.xml

File renamed without changes.

‎modules/org.restlet.example.book.restlet.ch08.gae/src/META-INF/persistence.xml renamed to ‎modules/org.restlet.example.book.restlet.ch08.gae/src/main/resources/META-INF/persistence.xml

File renamed without changes.

‎modules/org.restlet.example.book.restlet.ch09.gwt/src/META-INF/jdoconfig.xml renamed to ‎modules/org.restlet.example.book.restlet.ch09.gwt/src/main/resources/META-INF/jdoconfig.xml

File renamed without changes.

‎modules/org.restlet.example.book.restlet.ch09.gwt/src/META-INF/persistence.xml renamed to ‎modules/org.restlet.example.book.restlet.ch09.gwt/src/main/resources/META-INF/persistence.xml

File renamed without changes.

‎modules/org.restlet.example/module.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,15 @@
4343
<files-sets>
4444
<![CDATA[
4545
<exclude name="OSGI-INF/*" />
46-
<exclude name="src/org/restlet/example/ext/osgi/**" />
46+
<exclude name="src/main/java/org/restlet/example/ext/osgi/**" />
4747
]]>
4848
</files-sets>
4949
</source>
5050
<source edition="jse">
5151
<files-sets>
5252
<![CDATA[
5353
<exclude name="OSGI-INF/*" />
54-
<exclude name="src/org/restlet/example/ext/osgi/**" />
54+
<exclude name="src/main/java/org/restlet/example/ext/osgi/**" />
5555
]]>
5656
</files-sets>
5757
</source>

‎modules/org.restlet.example/OSGI-INF/application.xml renamed to ‎modules/org.restlet.example/src/main/resources/OSGI-INF/application.xml

File renamed without changes.

‎modules/org.restlet.example/OSGI-INF/example.xml renamed to ‎modules/org.restlet.example/src/main/resources/OSGI-INF/example.xml

File renamed without changes.

‎modules/org.restlet.example/OSGI-INF/hello.xml renamed to ‎modules/org.restlet.example/src/main/resources/OSGI-INF/hello.xml

File renamed without changes.

‎modules/org.restlet.example/OSGI-INF/router.xml renamed to ‎modules/org.restlet.example/src/main/resources/OSGI-INF/router.xml

File renamed without changes.

‎modules/org.restlet.example/config/localConfig.xml renamed to ‎modules/org.restlet.example/src/main/resources/config/localConfig.xml

File renamed without changes.

‎modules/org.restlet.example/config/log4j.properties renamed to ‎modules/org.restlet.example/src/main/resources/config/log4j.properties

File renamed without changes.

‎modules/org.restlet.example/config/mypassword renamed to ‎modules/org.restlet.example/src/main/resources/config/mypassword

File renamed without changes.

‎modules/org.restlet.example/config/resourceRules.xml renamed to ‎modules/org.restlet.example/src/main/resources/config/resourceRules.xml

File renamed without changes.

‎modules/org.restlet.example/config/sdc.keystore renamed to ‎modules/org.restlet.example/src/main/resources/config/sdc.keystore

File renamed without changes.

‎modules/org.restlet.example/config/sdc.keytool renamed to ‎modules/org.restlet.example/src/main/resources/config/sdc.keytool

File renamed without changes.

‎modules/org.restlet.example/resources/README.txt renamed to ‎modules/org.restlet.example/src/main/resources/resources/README.txt

File renamed without changes.

‎modules/org.restlet.example/resources/authorize.html renamed to ‎modules/org.restlet.example/src/main/resources/resources/authorize.html

File renamed without changes.

‎modules/org.restlet.example/resources/error.html renamed to ‎modules/org.restlet.example/src/main/resources/resources/error.html

File renamed without changes.

‎modules/org.restlet.example/resources/localhost.cer renamed to ‎modules/org.restlet.example/src/main/resources/resources/localhost.cer

File renamed without changes.

‎modules/org.restlet.example/resources/localhost.jks renamed to ‎modules/org.restlet.example/src/main/resources/resources/localhost.jks

File renamed without changes.

‎modules/org.restlet.example/resources/localhost.pem renamed to ‎modules/org.restlet.example/src/main/resources/resources/localhost.pem

File renamed without changes.

‎modules/org.restlet.example/resources/logging.properties renamed to ‎modules/org.restlet.example/src/main/resources/resources/logging.properties

File renamed without changes.

‎modules/org.restlet.example/resources/login.html renamed to ‎modules/org.restlet.example/src/main/resources/resources/login.html

File renamed without changes.

‎modules/org.restlet.example/resources/resources/bootstrap.min.css renamed to ‎modules/org.restlet.example/src/main/resources/resources/resources/bootstrap.min.css

File renamed without changes.

‎modules/org.restlet.ext.apispark/src/META-INF/services/org.restlet.ext.apispark.internal.introspection.IntrospectionHelper renamed to ‎modules/org.restlet.ext.apispark/src/main/resources/META-INF/services/org.restlet.ext.apispark.internal.introspection.IntrospectionHelper

File renamed without changes.

‎modules/org.restlet.ext.atom/src/META-INF/services/org.restlet.engine.converter.ConverterHelper renamed to ‎modules/org.restlet.ext.atom/src/main/resources/META-INF/services/org.restlet.engine.converter.ConverterHelper

File renamed without changes.

‎modules/org.restlet.ext.crypto/src/META-INF/services/org.restlet.engine.security.AuthenticatorHelper renamed to ‎modules/org.restlet.ext.crypto/src/main/resources/META-INF/services/org.restlet.engine.security.AuthenticatorHelper

File renamed without changes.

‎modules/org.restlet.ext.e4/.project

-17
This file was deleted.

‎modules/org.restlet.ext.emf/src/META-INF/services/org.restlet.engine.converter.ConverterHelper renamed to ‎modules/org.restlet.ext.emf/src/main/resources/META-INF/services/org.restlet.engine.converter.ConverterHelper

File renamed without changes.

‎modules/org.restlet.ext.fileupload/module.xml

-1
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,4 @@
1313
<dependency type="module" id="core" />
1414
<dependency type="module" id="servlet" includes="gae,jee" />
1515
</dependencies>
16-
<wikiUri>64-restlet</wikiUri>
1716
</module>

‎modules/org.restlet.ext.freemarker/module.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,4 @@
1111
<dependency type="library" id="freemarker" primary="true" />
1212
<dependency type="module" id="core" />
1313
</dependencies>
14-
<wikiUri>66-restlet</wikiUri>
15-
</module>
14+
</module>

‎modules/org.restlet.ext.freemarker/src/META-INF/services/org.restlet.engine.converter.ConverterHelper renamed to ‎modules/org.restlet.ext.freemarker/src/main/resources/META-INF/services/org.restlet.engine.converter.ConverterHelper

File renamed without changes.

‎modules/org.restlet.ext.gae/module.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,4 @@
1010
<dependency type="module" id="core" />
1111
<dependency type="library" id="appengine" />
1212
</dependencies>
13-
<wikiUri>405-restlet</wikiUri>
14-
</module>
13+
</module>

‎modules/org.restlet.ext.gson/src/META-INF/services/org.restlet.engine.converter.ConverterHelper renamed to ‎modules/org.restlet.ext.gson/src/main/resources/META-INF/services/org.restlet.engine.converter.ConverterHelper

File renamed without changes.

‎modules/org.restlet.ext.guice/module.xml

+1-4
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,4 @@
1212
<dependency type="library" id="aopalliance" />
1313
<dependency type="module" id="core" />
1414
</dependencies>
15-
<!--
16-
<wikiUri>66-restlet</wikiUri>
17-
-->
18-
</module>
15+
</module>

‎modules/org.restlet.ext.gwt/module.xml

+2-3
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,8 @@
1616
<source edition="jse">
1717
<files-sets>
1818
<![CDATA[
19-
<exclude name="src/org/restlet/ext/gwt/GwtShellServletWrapper.java" />
19+
<exclude name="src/main/java/org/restlet/ext/gwt/GwtShellServletWrapper.java" />
2020
]]>
2121
</files-sets>
2222
</source>
23-
<wikiUri>315-restlet</wikiUri>
24-
</module>
23+
</module>

‎modules/org.restlet.ext.gwt/src/META-INF/services/org.restlet.engine.converter.ConverterHelper renamed to ‎modules/org.restlet.ext.gwt/src/main/resources/META-INF/services/org.restlet.engine.converter.ConverterHelper

File renamed without changes.

‎modules/org.restlet.ext.html/module.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,4 @@
1010
<dependencies>
1111
<dependency type="module" id="core" />
1212
</dependencies>
13-
<wikiUri>412-restlet</wikiUri>
14-
</module>
13+
</module>

‎modules/org.restlet.ext.html/src/META-INF/services/org.restlet.engine.converter.ConverterHelper renamed to ‎modules/org.restlet.ext.html/src/main/resources/META-INF/services/org.restlet.engine.converter.ConverterHelper

File renamed without changes.

‎modules/org.restlet.ext.httpclient/module.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,4 @@
1717
<dependency type="library" id="mime4j" />
1818
<dependency type="module" id="core" />
1919
</dependencies>
20-
<wikiUri>75-restlet</wikiUri>
21-
</module>
20+
</module>

‎modules/org.restlet.ext.httpclient/src/META-INF/services/org.restlet.engine.ClientHelper renamed to ‎modules/org.restlet.ext.httpclient/src/main/resources/META-INF/services/org.restlet.engine.ClientHelper

File renamed without changes.

‎modules/org.restlet.ext.jaas/module.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,4 @@
99
<dependencies>
1010
<dependency type="module" id="core" />
1111
</dependencies>
12-
<wikiUri>67-restlet</wikiUri>
13-
</module>
12+
</module>

‎modules/org.restlet.ext.jackson/module.xml

+6-7
Original file line numberDiff line numberDiff line change
@@ -17,35 +17,35 @@
1717
<source edition="android">
1818
<files-sets>
1919
<![CDATA[
20-
<exclude name="src/org/restlet/ext/jackson/internal/Activator.java" />
20+
<exclude name="src/main/java/org/restlet/ext/jackson/internal/Activator.java" />
2121
]]>
2222
</files-sets>
2323
</source>
2424
<source edition="gae">
2525
<files-sets>
2626
<![CDATA[
27-
<exclude name="src/org/restlet/ext/jackson/internal/Activator.java" />
27+
<exclude name="src/main/java/org/restlet/ext/jackson/internal/Activator.java" />
2828
]]>
2929
</files-sets>
3030
</source>
3131
<source edition="gwt">
3232
<files-sets>
3333
<![CDATA[
34-
<exclude name="src/org/restlet/ext/jackson/internal/Activator.java" />
34+
<exclude name="src/main/java/org/restlet/ext/jackson/internal/Activator.java" />
3535
]]>
3636
</files-sets>
3737
</source>
3838
<source edition="jee">
3939
<files-sets>
4040
<![CDATA[
41-
<exclude name="src/org/restlet/ext/jackson/internal/Activator.java" />
41+
<exclude name="src/main/java/org/restlet/ext/jackson/internal/Activator.java" />
4242
]]>
4343
</files-sets>
4444
</source>
4545
<source edition="jse">
4646
<files-sets>
4747
<![CDATA[
48-
<exclude name="src/org/restlet/ext/jackson/internal/Activator.java" />
48+
<exclude name="src/main/java/org/restlet/ext/jackson/internal/Activator.java" />
4949
]]>
5050
</files-sets>
5151
</source>
@@ -55,5 +55,4 @@
5555
]]>
5656
</files-sets>
5757
</source>
58-
<wikiUri>299-restlet</wikiUri>
59-
</module>
58+
</module>

‎modules/org.restlet.ext.jackson/src/META-INF/services/org.restlet.engine.converter.ConverterHelper renamed to ‎modules/org.restlet.ext.jackson/src/main/resources/META-INF/services/org.restlet.engine.converter.ConverterHelper

File renamed without changes.

‎modules/org.restlet.ext.javamail/module.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,4 @@
1212
<dependency type="module" id="core" />
1313
<dependency type="module" id="xml" />
1414
</dependencies>
15-
<wikiUri>76-restlet</wikiUri>
16-
</module>
15+
</module>

‎modules/org.restlet.ext.javamail/src/META-INF/services/org.restlet.engine.ClientHelper renamed to ‎modules/org.restlet.ext.javamail/src/main/resources/META-INF/services/org.restlet.engine.ClientHelper

File renamed without changes.

‎modules/org.restlet.ext.javamail/src/META-INF/services/org.restlet.engine.converter.ConverterHelper renamed to ‎modules/org.restlet.ext.javamail/src/main/resources/META-INF/services/org.restlet.engine.converter.ConverterHelper

File renamed without changes.

‎modules/org.restlet.ext.jaxb/module.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,4 @@
1111
<dependency type="library" id="jaxb-ri" primary="true"/>
1212
<dependency type="module" id="core" />
1313
</dependencies>
14-
<wikiUri>67-restlet</wikiUri>
15-
</module>
14+
</module>

‎modules/org.restlet.ext.jaxb/src/META-INF/services/org.restlet.engine.converter.ConverterHelper renamed to ‎modules/org.restlet.ext.jaxb/src/main/resources/META-INF/services/org.restlet.engine.converter.ConverterHelper

File renamed without changes.

‎modules/org.restlet.ext.jaxrs/module.xml

+8-9
Original file line numberDiff line numberDiff line change
@@ -23,21 +23,20 @@
2323
<source edition="gae">
2424
<files-sets>
2525
<![CDATA[
26-
<exclude name="src/org/restlet/ext/jaxrs/internal/provider/FileProvider.java" />
26+
<exclude name="src/main/java/org/restlet/ext/jaxrs/internal/provider/FileProvider.java" />
2727
]]>
2828
</files-sets>
2929
</source>
3030
<source edition="android">
3131
<files-sets>
3232
<![CDATA[
33-
<exclude name="src/org/restlet/ext/jaxrs/internal/provider/AbstractJaxbProvider.java" />
34-
<exclude name="src/org/restlet/ext/jaxrs/internal/provider/DataSourceProvider.java" />
35-
<exclude name="src/org/restlet/ext/jaxrs/internal/provider/FileUploadProvider.java" />
36-
<exclude name="src/org/restlet/ext/jaxrs/internal/provider/JaxbElementProvider.java" />
37-
<exclude name="src/org/restlet/ext/jaxrs/internal/provider/JaxbProvider.java" />
38-
<exclude name="src/org/restlet/ext/jaxrs/internal/provider/MultipartProvider.java" />
33+
<exclude name="src/main/java/org/restlet/ext/jaxrs/internal/provider/AbstractJaxbProvider.java" />
34+
<exclude name="src/main/java/org/restlet/ext/jaxrs/internal/provider/DataSourceProvider.java" />
35+
<exclude name="src/main/java/org/restlet/ext/jaxrs/internal/provider/FileUploadProvider.java" />
36+
<exclude name="src/main/java/org/restlet/ext/jaxrs/internal/provider/JaxbElementProvider.java" />
37+
<exclude name="src/main/java/org/restlet/ext/jaxrs/internal/provider/JaxbProvider.java" />
38+
<exclude name="src/main/java/org/restlet/ext/jaxrs/internal/provider/MultipartProvider.java" />
3939
]]>
4040
</files-sets>
4141
</source>
42-
<wikiUri>57-restlet</wikiUri>
43-
</module>
42+
</module>

‎modules/org.restlet.ext.jaxrs/src/META-INF/services/javax.ws.rs.ext.RuntimeDelegate renamed to ‎modules/org.restlet.ext.jaxrs/src/main/resources/META-INF/services/javax.ws.rs.ext.RuntimeDelegate

File renamed without changes.

‎modules/org.restlet.ext.jdbc/.project

-17
This file was deleted.

‎modules/org.restlet.ext.jetty/src/META-INF/services/org.restlet.engine.ClientHelper renamed to ‎modules/org.restlet.ext.jetty/src/main/resources/META-INF/services/org.restlet.engine.ClientHelper

File renamed without changes.

‎modules/org.restlet.ext.jetty/src/META-INF/services/org.restlet.engine.ServerHelper renamed to ‎modules/org.restlet.ext.jetty/src/main/resources/META-INF/services/org.restlet.engine.ServerHelper

File renamed without changes.

‎modules/org.restlet.ext.jibx/module.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,4 @@
1111
<dependency type="library" id="jibx" primary="true" />
1212
<dependency type="module" id="core" />
1313
</dependencies>
14-
<wikiUri>68-restlet</wikiUri>
15-
</module>
14+
</module>

‎modules/org.restlet.ext.jibx/src/META-INF/services/org.restlet.engine.converter.ConverterHelper renamed to ‎modules/org.restlet.ext.jibx/src/main/resources/META-INF/services/org.restlet.engine.converter.ConverterHelper

File renamed without changes.

‎modules/org.restlet.ext.json/module.xml

+6-7
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,13 @@
2323
<custom classname="selector.EditionFileSelector" classpathref="forge-path">
2424
<param name="edition" value="gwt"/>
2525
</custom>
26-
<exclude name="src/org/restlet/ext/json/JsonpFilter.java" />
27-
<exclude name="src/org/restlet/ext/json/JsonpRepresentation.java" />
28-
<exclude name="src/org/restlet/ext/json/JsonRepresentation.java" />
29-
<exclude name="src/org/restlet/ext/json/JsonConverter.java" />
30-
<exclude name="src/META-INF/**" />
26+
<exclude name="src/main/java/org/restlet/ext/json/JsonpFilter.java" />
27+
<exclude name="src/main/java/org/restlet/ext/json/JsonpRepresentation.java" />
28+
<exclude name="src/main/java/org/restlet/ext/json/JsonRepresentation.java" />
29+
<exclude name="src/main/java/org/restlet/ext/json/JsonConverter.java" />
30+
<exclude name="src/main/resources/META-INF/**" />
3131
]]>
3232
</files-sets>
3333
</source>
3434
<stage edition="gwt" includesource="true" />
35-
<wikiUri>69-restlet</wikiUri>
36-
</module>
35+
</module>

‎modules/org.restlet.ext.json/src/META-INF/services/org.restlet.engine.converter.ConverterHelper renamed to ‎modules/org.restlet.ext.json/src/main/resources/META-INF/services/org.restlet.engine.converter.ConverterHelper

File renamed without changes.

‎modules/org.restlet.ext.jsslutils/.project

-17
This file was deleted.

‎modules/org.restlet.ext.lucene/module.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,4 @@
1515
<dependency type="module" id="core" />
1616
<dependency type="module" id="xml" />
1717
</dependencies>
18-
<wikiUri>229-restlet</wikiUri>
19-
</module>
18+
</module>

‎modules/org.restlet.ext.lucene/src/META-INF/services/org.restlet.engine.ClientHelper renamed to ‎modules/org.restlet.ext.lucene/src/main/resources/META-INF/services/org.restlet.engine.ClientHelper

File renamed without changes.

‎modules/org.restlet.ext.nio/module.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,4 @@
1010
<dependencies>
1111
<dependency type="module" id="core" />
1212
</dependencies>
13-
<wikiUri>79-restlet</wikiUri>
14-
</module>
13+
</module>

‎modules/org.restlet.ext.nio/src/META-INF/services/org.restlet.engine.ClientHelper renamed to ‎modules/org.restlet.ext.nio/src/main/resources/META-INF/services/org.restlet.engine.ClientHelper

File renamed without changes.

‎modules/org.restlet.ext.nio/src/META-INF/services/org.restlet.engine.ServerHelper renamed to ‎modules/org.restlet.ext.nio/src/main/resources/META-INF/services/org.restlet.engine.ServerHelper

File renamed without changes.

‎modules/org.restlet.ext.oauth/module.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,4 @@
3030
</repositories>
3131
]]>
3232
</maven-misc>
33-
<wikiUri>392-restlet</wikiUri>
34-
</module>
33+
</module>

‎modules/org.restlet.ext.oauth/src/META-INF/MANIFEST.MF renamed to ‎modules/org.restlet.ext.oauth/src/main/resources/META-INF/MANIFEST.MF

File renamed without changes.

‎modules/org.restlet.ext.oauth/src/META-INF/services/org.restlet.engine.security.AuthenticatorHelper renamed to ‎modules/org.restlet.ext.oauth/src/main/resources/META-INF/services/org.restlet.engine.security.AuthenticatorHelper

File renamed without changes.

‎modules/org.restlet.ext.odata/module.xml

+4-5
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,17 @@
1717
<source edition="android">
1818
<files-sets>
1919
<![CDATA[
20-
<exclude name="src/org/restlet/ext/odata/Generator.java" />
21-
<exclude name="src/org/restlet/ext/odata/internal/templates/**" />
20+
<exclude name="src/main/java/org/restlet/ext/odata/Generator.java" />
21+
<exclude name="src/main/java/org/restlet/ext/odata/internal/templates/**" />
2222
]]>
2323
</files-sets>
2424
</source>
2525
<source edition="gae">
2626
<files-sets>
2727
<![CDATA[
28-
<exclude name="src/org/restlet/ext/odata/Generator.java" />
29-
<exclude name="src/org/restlet/ext/odata/internal/templates/**" />
28+
<exclude name="src/main/java/org/restlet/ext/odata/Generator.java" />
29+
<exclude name="src/main/java/org/restlet/ext/odata/internal/templates/**" />
3030
]]>
3131
</files-sets>
3232
</source>
33-
<wikiUri>287-restlet</wikiUri>
3433
</module>

0 commit comments

Comments
 (0)