Move implementation private files from com.jogamp.<module>.impl. to jogamp.<module> (2/2) - edit files

- jogamp.openal                     -> jogamp.openal

This sorts implementation details from the top level, ie skipping the public 'com',
allowing a better seperation of public classes and implementation details
and also reduces strings.

This approach of public/private seperation is also used in the OpenJDK.

4 files changed, 21 insertions, 17 deletions

diff --git a/make/build-test.xml b/make/build-test.xml
index 3340906..58c3db9 100644
--- a/make/build-test.xml
+++ b/make/build-test.xml
@@ -43,7 +43,6 @@
     </taskdef>
 
     <target name="declare.common">
-        <mkdir dir="classes"/>
         <property name="rootrel.src.test"     value="src/test" />
         <property name="src.test"             value="${project.root}/${rootrel.src.test}" />
 
@@ -51,8 +50,8 @@
         <property name="build.test"           value="${build}/test/build" />
         <property name="obj.test"             value="${build.test}/obj"/>
 
-        <property name="classes"              value="${build.test}/classes" />
-        <property name="classes.path"         location="${classes}"/> <!-- absolute path -->
+        <property name="classes.test"         value="${build.test}/classes" />
+        <property name="classes.test.path"    location="${classes.test}"/> <!-- absolute path -->
 
         <property name="java.dir.test"        value="com/jogamp/openal/test"/>
         <property name="java.part.test"       value="${java.dir.test}/**"/>
@@ -65,6 +64,8 @@
         <property name="test.archive.name"    value="${archive.name}-test-results"/>
 
         <property name="batchtest.timeout"    value="1800000"/> <!-- 30 min -->
+
+        <mkdir dir="${classes.test}"/>
     </target>
 
     <target name="test.compile" depends="declare.common">
@@ -75,13 +76,13 @@
         </delete>
         <mkdir dir="${results.test}"/>
     
-        <javac debug="true" srcdir="${src.test}" destdir="${classes}" includeantruntime="false"
+        <javac debug="true" srcdir="${src.test}" destdir="${classes.test}" includeantruntime="false"
             classpath="${gluegen-rt.jar};../build/joal.jar;${junit.path}"/>
-        <copy todir="${classes}">
+        <copy todir="${classes.test}">
             <fileset dir="${src.test}" includes="**/*.wav"/>
         </copy>
         <jar destfile="${build}/joal-test.jar">
-            <fileset dir="${classes}">
+            <fileset dir="${classes.test}">
               <include name="**" />
             </fileset>
         </jar>
@@ -103,7 +104,7 @@
             <jvmarg value="-Djogamp.debug.ProcAddressHelper=true"/> -->
             <jvmarg value="-Djoal.debug.Factory"/>
             <batchtest todir="${results.test}">
-                <fileset dir="${classes}">
+                <fileset dir="${classes.test}">
                     <include name="${java.dir.junit}/**/*Test*"/>
                 </fileset>
                 <formatter usefile="false" type="plain"/>
@@ -119,18 +120,18 @@
     <target name="test.manual.run" depends="test.compile">
         <for param="test.class.path.m" keepgoing="true">
             <!-- results in absolute path -->
-            <fileset dir="${classes}">
+            <fileset dir="${classes.test}">
                 <include name="${java.dir.manual}/**/*Test*"/>
                 <exclude name="**/*$$*"/>
             </fileset>
           <sequential>
             <var name="test.class.path" unset="true"/>
-            <property name="test.class.path" basedir="${classes}" relative="true" location="@{test.class.path.m}"/>
+            <property name="test.class.path" basedir="${classes.test}" relative="true" location="@{test.class.path.m}"/>
             <var name="test.class.fqn" unset="true"/>
             <pathconvert property="test.class.fqn">
-              <fileset file="${classes}${file.separator}${test.class.path}"/>
+              <fileset file="${classes.test}${file.separator}${test.class.path}"/>
               <chainedmapper>
-                  <globmapper    from="${classes.path}${file.separator}*" to="*"/> <!-- rel. -->
+                  <globmapper    from="${classes.test.path}${file.separator}*" to="*"/> <!-- rel. -->
                   <packagemapper from="*.class"           to="*"/> <!-- FQCN -->
               </chainedmapper>
             </pathconvert>
@@ -153,7 +154,7 @@
                 <arg line="-Djoal.debug.Factory"/>
                 <srcfile/>
                 <mappedresources>
-                    <fileset dir="${classes}" includes="${test.class.path}"/>
+                    <fileset dir="${classes.test}" includes="${test.class.path}"/>
                     <packagemapper from="*.class" to="*"/>
                 </mappedresources>
             </apply>
diff --git a/make/build.xml b/make/build.xml
index 8ea1554..bc71e7c 100755
--- a/make/build.xml
+++ b/make/build.xml
@@ -390,6 +390,7 @@
         <jar manifest="tempversion" destfile="${joal.jar}">
             <fileset dir="${classes}">
                 <include name="com/jogamp/openal/**" />
+                <include name="jogamp/openal/**" />
             </fileset>
         </jar>
         <delete file="tempversion"/>
@@ -449,7 +450,7 @@
         <property name="javadoc.joal.dev.path"    value="${javadoc.root.path}/joal/javadoc_dev" />
 
         <property name="javadoc.packagenames" value="com.jogamp.openal,com.jogamp.openal.util,com.jogamp.openal.sound3d" />
-        <property name="javadoc.dev.packagenames" value="${javadoc.packagenames},com.jogamp.openal.impl" />
+        <property name="javadoc.dev.packagenames" value="${javadoc.packagenames},jogamp.openal" />
 
         <!-- if gluegen-javadoc.path is not set, check in default location, 
              ${gluegen.root}/${rootrel.build}/javadoc/gluegen -->
diff --git a/make/joal-alc.cfg b/make/joal-alc.cfg
index b8013ab..71b5fa6 100755
--- a/make/joal-alc.cfg
+++ b/make/joal-alc.cfg
@@ -3,7 +3,7 @@ Include joal-common.cfg
 
 Style InterfaceAndImpl
 JavaClass ALC
-ImplPackage com.jogamp.openal.impl
+ImplPackage jogamp.openal
 ImplJavaClass ALCAbstractImpl
 AccessControl ALCAbstractImpl PUBLIC_ABSTRACT
 Extends ALC ALCConstants
@@ -16,7 +16,7 @@ ProcAddressNameExpr LP $UPPERCASE({0})
 Import java.io.UnsupportedEncodingException
 Import java.util.*
 Import com.jogamp.openal.*
-Import com.jogamp.openal.impl.*
+Import jogamp.openal.*
 
 # Factor out the OpenAL constants into their own interface
 Ignore ^AL_.+
diff --git a/make/joal.cfg b/make/joal.cfg
index e398112..5ce03f8 100755
--- a/make/joal.cfg
+++ b/make/joal.cfg
@@ -3,7 +3,7 @@ Include joal-common.cfg
 
 Style InterfaceAndImpl
 JavaClass AL
-ImplPackage com.jogamp.openal.impl
+ImplPackage jogamp.openal
 ImplJavaClass ALImpl
 Extends AL ALConstants
 
@@ -14,7 +14,9 @@ ProcAddressNameExpr LP $UPPERCASE({0})
 
 
 Import com.jogamp.openal.*
-Import com.jogamp.openal.impl.*
+Import jogamp.openal.*
+Import java.security.AccessController
+Import java.security.PrivilegedAction
 
 # Factor out the OpenAL constants into their own interface
 Ignore ^AL_.+