Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
View | Details | Raw Unified | Return to bug 133301
Collapse All | Expand All

(-)C:/Documents and Settings/lperon/Bureau/org.eclipse.jst.j2ee.ejb.annotations.xdoclet_1.1.1.v200609141515/templates/builder/xdoclet.xml.original (-2 / +23 lines)
Lines 23-35 Link Here
23
23
24
   <!-- Init -->
24
   <!-- Init -->
25
   <target name="init">
25
   <target name="init">
26
27
      <!-- Divert some properties to allow loading from another file -->
28
      <replace file="build.properties" token="ejb.module.gen" value="diverted.ejb.module.gen"/>
29
26
      <property file="build.properties"/>
30
      <property file="build.properties"/>
27
31
32
      <property file="${ejb.project.dir}/jst-xdoclet.properties"/>
33
34
      <!-- Use diverted values if not set -->
35
      <property name="ejb.module.gen" value="${diverted.ejb.module.gen}"/>
36
28
      <!-- property name="ejb.dd.dir" value="${ejb.project.dir}/${ejb.module.src}/META-INF"/ -->
37
      <!-- property name="ejb.dd.dir" value="${ejb.project.dir}/${ejb.module.src}/META-INF"/ -->
29
      <property name="ejb.dd.dir" value="${ejb.metainf.dir}" />
38
      <property name="ejb.dd.dir" value="${ejb.metainf.dir}" />
30
   	  <property name="xdoclet.force" value="true"/>
39
   	  <property name="xdoclet.force" value="true"/>
31
      <property name="container.type" value="ejb-jar"/>
40
      <property name="container.type" value="ejb-jar"/>
32
      
41
33
   	  <!-- Set up java.class.path -->
42
   	  <!-- Set up java.class.path -->
34
      <path id="project.class.path">
43
      <path id="project.class.path">
35
        <pathelement location="${ejb.project.dir}/${ejb.bin.dir}" />
44
        <pathelement location="${ejb.project.dir}/${ejb.bin.dir}" />
Lines 58-63 Link Here
58
		<classpath refid="project.class.path"/>
67
		<classpath refid="project.class.path"/>
59
	</taskdef>
68
	</taskdef>
60
69
70
      <delete includeemptydirs="true" failonerror="false">
71
         <fileset dir="${ejb.module.gen}" includes="**/*">
72
            <!--contains text="Generated by XDoclet - Do not edit!" casesensitive="no"/-->
73
            <containsregexp expression=".*Generated.* - Do not edit!.*"/>
74
         </fileset>
75
      </delete>
61
76
62
      <ejbdoclet
77
      <ejbdoclet
63
            destdir="${ejb.module.gen}"
78
            destdir="${ejb.module.gen}"
Lines 84-97 Link Here
84
    </target>
99
    </target>
85
	
100
	
86
	<target name="client.jar" if="ejb.client.module.src">
101
	<target name="client.jar" if="ejb.client.module.src">
102
        <delete includeemptydirs="true" failonerror="false">
103
            <fileset dir="${ejb.client.module.src}" includes="**/*">
104
               <containsregexp expression=".*Generated.* - Do not edit!.*"/>
105
            </fileset>
106
        </delete>
87
	  	  <move todir="${ejb.client.module.src}" >
107
	  	  <move todir="${ejb.client.module.src}" >
88
			<fileset dir="${ejb.module.src}" id="id">
108
			<fileset dir="${ejb.module.gen}" id="id">
89
			    <include name="**/*.java"/>
109
			    <include name="**/*.java"/>
90
			    <exclude name="**/*Bean.java"/>
110
			    <exclude name="**/*Bean.java"/>
91
			    <exclude name="**/*EJB.java"/>
111
			    <exclude name="**/*EJB.java"/>
92
			    <exclude name="**/*Session.java"/>
112
			    <exclude name="**/*Session.java"/>
93
			    <exclude name="**/*Mdb.java"/>
113
			    <exclude name="**/*Mdb.java"/>
94
				<exclude name="**/*CMP.java"/>
114
				<exclude name="**/*CMP.java"/>
115
               <containsregexp expression=".*Generated.* - Do not edit!.*"/>
95
			</fileset>
116
			</fileset>
96
	   	  </move>		
117
	   	  </move>		
97
	</target>
118
	</target>

Return to bug 133301