1.1 --- a/samples/composition/build.xml Sat Jun 14 09:57:58 2008 +0200
1.2 +++ b/samples/composition/build.xml Sat Jun 14 09:58:00 2008 +0200
1.3 @@ -18,6 +18,9 @@
1.4 <antcall target="-build-one">
1.5 <param name="version" value="api2.0-property"/>
1.6 </antcall>
1.7 + <antcall target="-build-one">
1.8 + <param name="version" value="api2.0-enum"/>
1.9 + </antcall>
1.10
1.11 <antcall target="-build-one">
1.12 <param name="version" value="test"/>
1.13 @@ -38,10 +41,14 @@
1.14 <antcall target="-run-one">
1.15 <param name="version" value="api2.0-compat"/>
1.16 </antcall>
1.17 - <echo level="info" message="Running the Implementation against Version 2.0 with another compatible extension of the API. This should succeed."/>
1.18 + <echo level="info" message="Running the Implementation against Version 2.0 with property guarded extension of the API. This should succeed."/>
1.19 <antcall target="-run-one">
1.20 <param name="version" value="api2.0-property"/>
1.21 </antcall>
1.22 + <echo level="info" message="Running the Implementation against Version 2.0 with enum guarded extension of the API. This should succeed."/>
1.23 + <antcall target="-run-one">
1.24 + <param name="version" value="api2.0-enum"/>
1.25 + </antcall>
1.26 </target>
1.27
1.28 <!-- support methods -->
2.1 --- a/samples/composition/nbproject/project.xml Sat Jun 14 09:57:58 2008 +0200
2.2 +++ b/samples/composition/nbproject/project.xml Sat Jun 14 09:58:00 2008 +0200
2.3 @@ -40,6 +40,12 @@
2.4 <location>src-test</location>
2.5 <encoding>UTF-8</encoding>
2.6 </source-folder>
2.7 + <source-folder>
2.8 + <label>src-api2.0-enum</label>
2.9 + <type>java</type>
2.10 + <location>src-api2.0-enum</location>
2.11 + <encoding>UTF-8</encoding>
2.12 + </source-folder>
2.13 </folders>
2.14 <ide-actions>
2.15 <action name="build">
2.16 @@ -78,6 +84,10 @@
2.17 <location>src-api2.0-property</location>
2.18 </source-folder>
2.19 <source-folder style="packages">
2.20 + <label>API Version 2.0, with enum</label>
2.21 + <location>src-api2.0-enum</location>
2.22 + </source-folder>
2.23 + <source-folder style="packages">
2.24 <label>Usage of the API</label>
2.25 <location>src-test</location>
2.26 </source-folder>
2.27 @@ -108,6 +118,10 @@
2.28 <source-level>1.5</source-level>
2.29 </compilation-unit>
2.30 <compilation-unit>
2.31 + <package-root>src-api2.0-enum</package-root>
2.32 + <source-level>1.5</source-level>
2.33 + </compilation-unit>
2.34 + <compilation-unit>
2.35 <package-root>src-api2.0-property</package-root>
2.36 <source-level>1.5</source-level>
2.37 </compilation-unit>