upgraded 11.1.2 version to 12c

adfemg · Jul 16, 2013 · e745105 · e745105
1 parent fb8a407
commit e745105
Show file tree

Hide file tree

Showing 9 changed files with 108 additions and 289 deletions.
diff --git a/Designtime/build/build.properties b/Designtime/build/build.properties
@@ -1,5 +1,5 @@
 tft.home=..
-tft.version.number=11.1.2.1.32
+tft.version.number=12.1.2.0.0
 
 tft.design.dir=${tft.home}/Designtime
 tft.design.source.dir=${tft.design.dir}/src

diff --git a/Designtime/build/build.xml b/Designtime/build/build.xml
@@ -14,7 +14,7 @@
       <pathelement location="${oracle.home}/jdev/extensions/oracle.ide.library.jar"/>
       <pathelement location="${oracle.home}/jdev/extensions/oracle.jdeveloper.runner.jar"/>
       <pathelement location="${oracle.home}/jdev/extensions/oracle.adf-faces-dt.jar"/>
-        <pathelement location="${oracle.commons}/modules/oracle.javatools_11.1.1/javatools-nodeps.jar"/>
+        <pathelement location="${oracle.commons}/modules/oracle.javatools_12.1.2/javatools-nodeps.jar"/>
       <pathelement location="${oracle.home}//ide/lib/javatools.jar"/>
 
 <!--
@@ -61,7 +61,7 @@
          <attribute name="Export-Package" value="org.emg.adf.tftester.dt.addin"/>
          <attribute name="Require-Bundle" value="oracle.ide.library,oracle.jdeveloper.runner,oracle.jdeveloper.runner.core,oracle.ide,oracle.ide.runner,oracle.idert,oracle.javatools,oracle.javatools-nodeps,oracle.adf-faces-dt"/>
          <attribute name="Bundle-ClassPath" value="."/>
-         <attribute name="Bundle-Version" value="11.1.2"/>
+         <attribute name="Bundle-Version" value="12.1.2"/>
          <attribute name="Bundle-ManifestVersion" value="2"/>
          <attribute name="Bundle-SymbolicName" value="org.emg.adf.taskflowtester"/>
        </manifest>
@@ -91,7 +91,7 @@
                    replace="&lt;version&gt;${tft.version.number}&lt;/version&gt;"/>
     <replaceregexp file="${tft.design.build.dir}/center.xml"
                    match="&lt;bundle-url&gt;(\s*)(.*)&lt;/bundle-url&gt;"
-                   replace="&lt;bundle-url&gt;jhs${tft.version.number}-install.zip&lt;/bundle-url&gt;"/>
+                   replace="&lt;bundle-url&gt;adfemg-tftester-${tft.version.number}-install.zip&lt;/bundle-url&gt;"/>
     <copy file="${tft.design.build.dir}/bundle.xml" todir="${tft.stage.dir}/META-INF"/>
     <copy file="${tft.design.build.dir}/center.xml" todir="${tft.stage.dir}"/>
     <copy file="${tft.design.deploy.dir}/org.emg.adf.taskflowtester.jar" todir="${tft.stage.dir}"/>

diff --git a/Designtime/build/bundle.xml b/Designtime/build/bundle.xml
@@ -4,7 +4,7 @@
   xmlns:u="http://xmlns.oracle.com/jdeveloper/update">
    <u:update id="org.emg.adf.taskflowtester">
       <u:name>ADF EMG Task Flow Tester</u:name>
-      <u:version>11.1.2.1.32</u:version>
+      <u:version>12.1.2.0.0</u:version>
       <u:author>ADF Enterprise Methodology Group (Steven Davelaar)</u:author>
       <u:author-url>http://java.net/projects/adf-task-flow-tester/pages/Home</u:author-url>
       <u:description>ADF EMG Task Flow Tester is a web-based testing tool for ADF bounded task flows. 
@@ -13,7 +13,7 @@ A set of task flow input parameters and run options can be saved as a task flow
 After installing this extension, you need to add the 'ADF EMG Task Flow Tester' library to your project. This will add a run configuration to your project that launches the tester.
 </u:description>
       <u:requirements>
-         <u:requires-extension id="oracle.j2ee" minVersion="11.1.2.0.0" maxVersion="12.9.9.99.99"/>
+         <u:requires-extension id="oracle.j2ee" minVersion="12.1.2.0.0" maxVersion="12.9.9.99.99"/>
       </u:requirements>
    </u:update>
 </update-bundle>
diff --git a/Designtime/build/center.xml b/Designtime/build/center.xml
@@ -1,7 +1,7 @@
 <updates version="1.0" xmlns="http://xmlns.oracle.com/jdeveloper/updatecenter">
    <update id="org.emg.adf.taskflowtester" xmlns="http://xmlns.oracle.com/jdeveloper/update">
       <name>ADF EMG Task Flow Tester</name>
-      <version>11.1.2.1.32</version>
+      <version>12.1.2.0.0</version>
       <author>ADF Enterprise Methodology Group (Steven Davelaar)</author>
       <author-url>http://java.net/projects/adf-task-flow-tester/pages/Home</author-url>
       <description>ADF EMG Task Flow Tester is a web-based testing tool for ADF bounded task flows. 
@@ -10,8 +10,8 @@ A set of task flow input parameters and run options can be saved as a task flow
 After installing this extension, you need to add the 'ADF EMG Task Flow Tester' library to your project. This will add a run configuration to your project that launches the tester.
 </description>
       <requirements>
-         <requires-extension id="oracle.j2ee" minVersion="11.1.2.0.0" maxVersion="12.9.9.99.99"/>
+         <requires-extension id="oracle.j2ee" minVersion="12.1.2.0.0" maxVersion="12.9.9.99.99"/>
       </requirements>
-      <bundle-url>jhs11.1.2.1.32-install.zip</bundle-url>
+      <bundle-url>adfemg-tftester-12.1.2.0.0-install.zip</bundle-url>
    </update>
 </updates>
diff --git a/Designtime/src/META-INF/extension.xml b/Designtime/src/META-INF/extension.xml
@@ -1,25 +1,11 @@
 <extension xmlns="http://jcp.org/jsr/198/extension-manifest"
            id="org.emg.adf.taskflowtester"
-           version="11.1.2.1.32"
+           version="12.1.2.0.0"
            esdk-version="1.0">
   <name>ADF EMG Task Flow Tester</name>
   <owner>ADF Enterprise Methodology Group</owner>
-   <dependencies>
 <!--
-    <import>oracle.adf.pageflow.dt</import>
-    <import>oracle.adf.pageflow.dt.runner</import>    
-    <import>oracle.adf.pageflow.dt.debug</import>    
-    <import>oracle.controller.dt</import>
-    <import>oracle.j2ee.xml.descriptors</import>
-    <import>oracle.j2ee.server</import>
-    <import>oracle.j2ee.webapp</import>
-    <import>oracle.j2ee.webapp.runner</import>
-    <import>oracle.adf.controller.dt</import>    
-    <import>oracle.adf.controller.config.dt</import>    
-    <import>oracle.adf.controller.deploy.dt</import>    
-    <import>oracle.j2ee.webapp.runner</import>        
-    <import>oracle.j2ee.jstl</import>        
--->
+   <dependencies>
     <import>oracle.ide</import>
     <import>oracle.ide.runner</import>
     <import>oracle.ide.xmlef</import>
@@ -30,25 +16,6 @@
 
 </dependencies>
    <required-bundles>
-<!--
-    <bundle>oracle.xmlef</bundle>
-    <bundle>oracle.xmlef-core</bundle>
-    <bundle>oracle.xmlef-swing</bundle>
-    <bundle>oracle.icons</bundle>
-    <bundle>oracle.uic</bundle>
-    <bundle>oracle.adf-controller-api</bundle>
-    <bundle>oracle.jewt-core</bundle>
-    <bundle>oracle.xml-descriptor</bundle>
-    <bundle>oracle.jgoodies-looks</bundle>
-    <bundle>oracle.adf.pageflow.dt</bundle>    
-    <bundle>oracle.adf.pageflow.dt.runner</bundle>    
-    <bundle>oracle.adf.controller.dt</bundle>    
-    <bundle>oracle.adf.controller.config.dt</bundle>    
-    <bundle>oracle.adf.controller.deploy.dt</bundle>    
-    <bundle>oracle.adf.pageflow.dt.debug</bundle>    
-    <bundle>oracle.j2ee.webapp.runner</bundle>        
-    <bundle>oracle.j2ee.jstl</bundle>        
--->
     <bundle>oracle.jdeveloper.java.core</bundle>
     <bundle>oracle.ide</bundle>
     <bundle>oracle.javaxide</bundle>
@@ -62,7 +29,7 @@
     <bundle>oracle.adf-faces-dt</bundle>    
 
 </required-bundles>
-
+-->
   <trigger-hooks xmlns="http://xmlns.oracle.com/ide/extension">
 
     <triggers>

diff --git a/Runtime/Runtime.jpr b/Runtime/Runtime.jpr
@@ -104,12 +104,15 @@
          <string v="ADFc"/>
          <string v="ADFm"/>
          <string v="Ant"/>
+         <string v="Database"/>
+         <string v="EJB"/>
          <string v="HTML"/>
          <string v="JAVASCRIPT"/>
          <string v="JSF"/>
          <string v="JSP"/>
          <string v="Java"/>
          <string v="TRINIDAD"/>
+         <string v="TopLink"/>
          <string v="XML"/>
          <string v="XML_SCHEMA"/>
          <string v="XSL"/>
@@ -243,10 +246,6 @@
             <value n="id" v="JSP Runtime"/>
             <value n="isJDK" v="false"/>
          </hash>
-         <hash>
-            <value n="id" v="JSF 2.0"/>
-            <value n="isJDK" v="false"/>
-         </hash>
          <hash>
             <value n="id" v="JSTL 1.2"/>
             <value n="isJDK" v="false"/>
@@ -332,22 +331,40 @@
             <value n="isJDK" v="false"/>
          </hash>
          <hash>
-            <value n="id" v="Java EE 1.5"/>
+            <value n="id" v="Java EE"/>
+            <value n="isJDK" v="false"/>
+         </hash>
+         <hash>
+            <value n="id" v="TopLink"/>
+            <value n="isJDK" v="false"/>
+         </hash>
+         <hash>
+            <value n="id" v="JSF 2.1"/>
+            <value n="isJDK" v="false"/>
+         </hash>
+         <hash>
+            <value n="id" v="Org.springframework_2.5.jar"/>
             <value n="isJDK" v="false"/>
          </hash>
       </list>
       <hash n="internalDefinitions">
-         <list n="libraryDefinitions"/>
+         <list n="libraryDefinitions">
+            <hash>
+               <list n="classPath">
+                  <url protocol="jar" path="file:/C:/jdev1212/oracle_common/modules/org.springframework_2.5.jar!/"/>
+               </list>
+               <value n="deployedByDefault" v="true"/>
+               <value n="description" v="Org.springframework_2.5.jar"/>
+               <value n="id" v="Org.springframework_2.5.jar"/>
+               <value n="locked" v="true"/>
+            </hash>
+         </list>
       </hash>
       <list n="libraryReferences">
          <hash>
             <value n="id" v="JSP Runtime"/>
             <value n="isJDK" v="false"/>
          </hash>
-         <hash>
-            <value n="id" v="JSF 2.0"/>
-            <value n="isJDK" v="false"/>
-         </hash>
          <hash>
             <value n="id" v="JSTL 1.2"/>
             <value n="isJDK" v="false"/>
@@ -433,7 +450,19 @@
             <value n="isJDK" v="false"/>
          </hash>
          <hash>
-            <value n="id" v="Java EE 1.5"/>
+            <value n="id" v="Java EE"/>
+            <value n="isJDK" v="false"/>
+         </hash>
+         <hash>
+            <value n="id" v="TopLink"/>
+            <value n="isJDK" v="false"/>
+         </hash>
+         <hash>
+            <value n="id" v="JSF 2.1"/>
+            <value n="isJDK" v="false"/>
+         </hash>
+         <hash>
+            <value n="id" v="Org.springframework_2.5.jar"/>
             <value n="isJDK" v="false"/>
          </hash>
       </list>

diff --git a/Runtime/build/build.properties b/Runtime/build/build.properties
@@ -1,6 +1,9 @@
 install.dir=${oracle.home}/..
 tft.home=../..
 
+bea.home=c:\\jdev1212
+jdev.home=c:\\jdev1212\\jdeveloper
+
 oracle.commons=${install.dir}/oracle_common
 oracle.home=${install.dir}/jdeveloper