diff --git a/jonas/jonas/.checkstyle b/jonas/.checkstyle similarity index 100% rename from jonas/jonas/.checkstyle rename to jonas/.checkstyle diff --git a/jonas/jonas/.classpath b/jonas/.classpath similarity index 100% rename from jonas/jonas/.classpath rename to jonas/.classpath diff --git a/jonas/jonas/.cvsignore b/jonas/.cvsignore similarity index 100% rename from jonas/jonas/.cvsignore rename to jonas/.cvsignore diff --git a/jonas/jonas/.jdis b/jonas/.jdis similarity index 100% rename from jonas/jonas/.jdis rename to jonas/.jdis diff --git a/jonas/jonas/.project b/jonas/.project similarity index 100% rename from jonas/jonas/.project rename to jonas/.project diff --git a/jonas/jonas/LicenceAgreement.txt b/jonas/LicenceAgreement.txt similarity index 100% rename from jonas/jonas/LicenceAgreement.txt rename to jonas/LicenceAgreement.txt diff --git a/jonas/jonas/README b/jonas/README similarity index 100% rename from jonas/jonas/README rename to jonas/README diff --git a/jonas/jonas/README.J2EE b/jonas/README.J2EE similarity index 100% rename from jonas/jonas/README.J2EE rename to jonas/README.J2EE diff --git a/jonas/jonas/ReleaseNotes.txt b/jonas/ReleaseNotes.txt similarity index 100% rename from jonas/jonas/ReleaseNotes.txt rename to jonas/ReleaseNotes.txt diff --git a/jonas/jonas/apps/README b/jonas/apps/README similarity index 100% rename from jonas/jonas/apps/README rename to jonas/apps/README diff --git a/jonas/jonas/apps/autoload/README b/jonas/apps/autoload/README similarity index 100% rename from jonas/jonas/apps/autoload/README rename to jonas/apps/autoload/README diff --git a/jonas/jonas/build-jb.properties b/jonas/build-jb.properties similarity index 100% rename from jonas/jonas/build-jb.properties rename to jonas/build-jb.properties diff --git a/jonas/jonas/build-jb.xml b/jonas/build-jb.xml similarity index 100% rename from jonas/jonas/build-jb.xml rename to jonas/build-jb.xml diff --git a/jonas/jonas/build.dtd b/jonas/build.dtd similarity index 100% rename from jonas/jonas/build.dtd rename to jonas/build.dtd diff --git a/jonas/jonas/build.properties b/jonas/build.properties similarity index 100% rename from jonas/jonas/build.properties rename to jonas/build.properties diff --git a/jonas/jonas/build.xml b/jonas/build.xml similarity index 100% rename from jonas/jonas/build.xml rename to jonas/build.xml diff --git a/jonas/jonas/clientbuild.xml b/jonas/clientbuild.xml similarity index 100% rename from jonas/jonas/clientbuild.xml rename to jonas/clientbuild.xml diff --git a/jonas/jonas/clients/README b/jonas/clients/README similarity index 100% rename from jonas/jonas/clients/README rename to jonas/clients/README diff --git a/jonas/jonas/doc/README b/jonas/doc/README similarity index 100% rename from jonas/jonas/doc/README rename to jonas/doc/README diff --git a/jonas/jonas/doc/jonas-doc-en.war b/jonas/doc/jonas-doc-en.war similarity index 100% rename from jonas/jonas/doc/jonas-doc-en.war rename to jonas/doc/jonas-doc-en.war diff --git a/jonas/jonas/doc/jonas-emb-javadoc.war b/jonas/doc/jonas-emb-javadoc.war similarity index 100% rename from jonas/jonas/doc/jonas-emb-javadoc.war rename to jonas/doc/jonas-emb-javadoc.war diff --git a/jonas/jonas/eclipse-settings/checkstyle-convention.xml b/jonas/eclipse-settings/checkstyle-convention.xml similarity index 100% rename from jonas/jonas/eclipse-settings/checkstyle-convention.xml rename to jonas/eclipse-settings/checkstyle-convention.xml diff --git a/jonas/jonas/eclipse-settings/eclipse-java-code-formatter.xml b/jonas/eclipse-settings/eclipse-java-code-formatter.xml similarity index 100% rename from jonas/jonas/eclipse-settings/eclipse-java-code-formatter.xml rename to jonas/eclipse-settings/eclipse-java-code-formatter.xml diff --git a/jonas/jonas/eclipse-settings/eclipse-java-codestyle-organize-import b/jonas/eclipse-settings/eclipse-java-codestyle-organize-import similarity index 100% rename from jonas/jonas/eclipse-settings/eclipse-java-codestyle-organize-import rename to jonas/eclipse-settings/eclipse-java-codestyle-organize-import diff --git a/jonas/jonas/eclipse-settings/jonas-style-convention.xml b/jonas/eclipse-settings/jonas-style-convention.xml similarity index 100% rename from jonas/jonas/eclipse-settings/jonas-style-convention.xml rename to jonas/eclipse-settings/jonas-style-convention.xml diff --git a/jonas/jonas/eclipse-settings/plugin-checkstyle-config.xml b/jonas/eclipse-settings/plugin-checkstyle-config.xml similarity index 100% rename from jonas/jonas/eclipse-settings/plugin-checkstyle-config.xml rename to jonas/eclipse-settings/plugin-checkstyle-config.xml diff --git a/jonas/jonas/ejbjars/README b/jonas/ejbjars/README similarity index 100% rename from jonas/jonas/ejbjars/README rename to jonas/ejbjars/README diff --git a/jonas/jonas/ejbjars/autoload/README b/jonas/ejbjars/autoload/README similarity index 100% rename from jonas/jonas/ejbjars/autoload/README rename to jonas/ejbjars/autoload/README diff --git a/jonas/jonas/examples/README b/jonas/examples/README similarity index 100% rename from jonas/jonas/examples/README rename to jonas/examples/README diff --git a/jonas/jonas/examples/alarm/README b/jonas/examples/alarm/README similarity index 100% rename from jonas/jonas/examples/alarm/README rename to jonas/examples/alarm/README diff --git a/jonas/jonas/examples/alarm/beans/org/objectweb/alarm/beans/AlarmData.java b/jonas/examples/alarm/beans/org/objectweb/alarm/beans/AlarmData.java similarity index 100% rename from jonas/jonas/examples/alarm/beans/org/objectweb/alarm/beans/AlarmData.java rename to jonas/examples/alarm/beans/org/objectweb/alarm/beans/AlarmData.java diff --git a/jonas/jonas/examples/alarm/beans/org/objectweb/alarm/beans/AlarmListenerBean.java b/jonas/examples/alarm/beans/org/objectweb/alarm/beans/AlarmListenerBean.java similarity index 100% rename from jonas/jonas/examples/alarm/beans/org/objectweb/alarm/beans/AlarmListenerBean.java rename to jonas/examples/alarm/beans/org/objectweb/alarm/beans/AlarmListenerBean.java diff --git a/jonas/jonas/examples/alarm/beans/org/objectweb/alarm/beans/AlarmManager.java b/jonas/examples/alarm/beans/org/objectweb/alarm/beans/AlarmManager.java similarity index 100% rename from jonas/jonas/examples/alarm/beans/org/objectweb/alarm/beans/AlarmManager.java rename to jonas/examples/alarm/beans/org/objectweb/alarm/beans/AlarmManager.java diff --git a/jonas/jonas/examples/alarm/beans/org/objectweb/alarm/beans/AlarmRecord.java b/jonas/examples/alarm/beans/org/objectweb/alarm/beans/AlarmRecord.java similarity index 100% rename from jonas/jonas/examples/alarm/beans/org/objectweb/alarm/beans/AlarmRecord.java rename to jonas/examples/alarm/beans/org/objectweb/alarm/beans/AlarmRecord.java diff --git a/jonas/jonas/examples/alarm/beans/org/objectweb/alarm/beans/AlarmRecordBean.java b/jonas/examples/alarm/beans/org/objectweb/alarm/beans/AlarmRecordBean.java similarity index 100% rename from jonas/jonas/examples/alarm/beans/org/objectweb/alarm/beans/AlarmRecordBean.java rename to jonas/examples/alarm/beans/org/objectweb/alarm/beans/AlarmRecordBean.java diff --git a/jonas/jonas/examples/alarm/beans/org/objectweb/alarm/beans/AlarmRecordHome.java b/jonas/examples/alarm/beans/org/objectweb/alarm/beans/AlarmRecordHome.java similarity index 100% rename from jonas/jonas/examples/alarm/beans/org/objectweb/alarm/beans/AlarmRecordHome.java rename to jonas/examples/alarm/beans/org/objectweb/alarm/beans/AlarmRecordHome.java diff --git a/jonas/jonas/examples/alarm/beans/org/objectweb/alarm/beans/Debug.java b/jonas/examples/alarm/beans/org/objectweb/alarm/beans/Debug.java similarity index 100% rename from jonas/jonas/examples/alarm/beans/org/objectweb/alarm/beans/Debug.java rename to jonas/examples/alarm/beans/org/objectweb/alarm/beans/Debug.java diff --git a/jonas/jonas/examples/alarm/beans/org/objectweb/alarm/beans/Profil.java b/jonas/examples/alarm/beans/org/objectweb/alarm/beans/Profil.java similarity index 100% rename from jonas/jonas/examples/alarm/beans/org/objectweb/alarm/beans/Profil.java rename to jonas/examples/alarm/beans/org/objectweb/alarm/beans/Profil.java diff --git a/jonas/jonas/examples/alarm/beans/org/objectweb/alarm/beans/View.java b/jonas/examples/alarm/beans/org/objectweb/alarm/beans/View.java similarity index 100% rename from jonas/jonas/examples/alarm/beans/org/objectweb/alarm/beans/View.java rename to jonas/examples/alarm/beans/org/objectweb/alarm/beans/View.java diff --git a/jonas/jonas/examples/alarm/beans/org/objectweb/alarm/beans/ViewBean.java b/jonas/examples/alarm/beans/org/objectweb/alarm/beans/ViewBean.java similarity index 100% rename from jonas/jonas/examples/alarm/beans/org/objectweb/alarm/beans/ViewBean.java rename to jonas/examples/alarm/beans/org/objectweb/alarm/beans/ViewBean.java diff --git a/jonas/jonas/examples/alarm/beans/org/objectweb/alarm/beans/ViewHome.java b/jonas/examples/alarm/beans/org/objectweb/alarm/beans/ViewHome.java similarity index 100% rename from jonas/jonas/examples/alarm/beans/org/objectweb/alarm/beans/ViewHome.java rename to jonas/examples/alarm/beans/org/objectweb/alarm/beans/ViewHome.java diff --git a/jonas/jonas/examples/alarm/beans/org/objectweb/alarm/beans/ViewProxy.java b/jonas/examples/alarm/beans/org/objectweb/alarm/beans/ViewProxy.java similarity index 100% rename from jonas/jonas/examples/alarm/beans/org/objectweb/alarm/beans/ViewProxy.java rename to jonas/examples/alarm/beans/org/objectweb/alarm/beans/ViewProxy.java diff --git a/jonas/jonas/examples/alarm/beans/org/objectweb/alarm/beans/alarm.xml b/jonas/examples/alarm/beans/org/objectweb/alarm/beans/alarm.xml similarity index 100% rename from jonas/jonas/examples/alarm/beans/org/objectweb/alarm/beans/alarm.xml rename to jonas/examples/alarm/beans/org/objectweb/alarm/beans/alarm.xml diff --git a/jonas/jonas/examples/alarm/beans/org/objectweb/alarm/beans/jonas-alarm.xml b/jonas/examples/alarm/beans/org/objectweb/alarm/beans/jonas-alarm.xml similarity index 100% rename from jonas/jonas/examples/alarm/beans/org/objectweb/alarm/beans/jonas-alarm.xml rename to jonas/examples/alarm/beans/org/objectweb/alarm/beans/jonas-alarm.xml diff --git a/jonas/jonas/examples/alarm/build.xml b/jonas/examples/alarm/build.xml similarity index 100% rename from jonas/jonas/examples/alarm/build.xml rename to jonas/examples/alarm/build.xml diff --git a/jonas/jonas/examples/alarm/client/org/objectweb/alarm/AlarmGenerator.java b/jonas/examples/alarm/client/org/objectweb/alarm/AlarmGenerator.java similarity index 100% rename from jonas/jonas/examples/alarm/client/org/objectweb/alarm/AlarmGenerator.java rename to jonas/examples/alarm/client/org/objectweb/alarm/AlarmGenerator.java diff --git a/jonas/jonas/examples/alarm/db1.prp b/jonas/examples/alarm/db1.prp similarity index 100% rename from jonas/jonas/examples/alarm/db1.prp rename to jonas/examples/alarm/db1.prp diff --git a/jonas/jonas/examples/alarm/etc/application.xml b/jonas/examples/alarm/etc/application.xml similarity index 100% rename from jonas/jonas/examples/alarm/etc/application.xml rename to jonas/examples/alarm/etc/application.xml diff --git a/jonas/jonas/examples/alarm/etc/jonas-web.xml b/jonas/examples/alarm/etc/jonas-web.xml similarity index 100% rename from jonas/jonas/examples/alarm/etc/jonas-web.xml rename to jonas/examples/alarm/etc/jonas-web.xml diff --git a/jonas/jonas/examples/alarm/etc/web-jetty.xml b/jonas/examples/alarm/etc/web-jetty.xml similarity index 100% rename from jonas/jonas/examples/alarm/etc/web-jetty.xml rename to jonas/examples/alarm/etc/web-jetty.xml diff --git a/jonas/jonas/examples/alarm/etc/web.xml b/jonas/examples/alarm/etc/web.xml similarity index 100% rename from jonas/jonas/examples/alarm/etc/web.xml rename to jonas/examples/alarm/etc/web.xml diff --git a/jonas/jonas/examples/alarm/src/org/objectweb/alarm/Sender.java b/jonas/examples/alarm/src/org/objectweb/alarm/Sender.java similarity index 100% rename from jonas/jonas/examples/alarm/src/org/objectweb/alarm/Sender.java rename to jonas/examples/alarm/src/org/objectweb/alarm/Sender.java diff --git a/jonas/jonas/examples/alarm/web/generator.html b/jonas/examples/alarm/web/generator.html similarity index 100% rename from jonas/jonas/examples/alarm/web/generator.html rename to jonas/examples/alarm/web/generator.html diff --git a/jonas/jonas/examples/alarm/web/images/alarmArchi.gif b/jonas/examples/alarm/web/images/alarmArchi.gif similarity index 100% rename from jonas/jonas/examples/alarm/web/images/alarmArchi.gif rename to jonas/examples/alarm/web/images/alarmArchi.gif diff --git a/jonas/jonas/examples/alarm/web/images/jetty.png b/jonas/examples/alarm/web/images/jetty.png similarity index 100% rename from jonas/jonas/examples/alarm/web/images/jetty.png rename to jonas/examples/alarm/web/images/jetty.png diff --git a/jonas/jonas/examples/alarm/web/images/logo_jonas.jpg b/jonas/examples/alarm/web/images/logo_jonas.jpg similarity index 100% rename from jonas/jonas/examples/alarm/web/images/logo_jonas.jpg rename to jonas/examples/alarm/web/images/logo_jonas.jpg diff --git a/jonas/jonas/examples/alarm/web/images/return.gif b/jonas/examples/alarm/web/images/return.gif similarity index 100% rename from jonas/jonas/examples/alarm/web/images/return.gif rename to jonas/examples/alarm/web/images/return.gif diff --git a/jonas/jonas/examples/alarm/web/images/tomcat.gif b/jonas/examples/alarm/web/images/tomcat.gif similarity index 100% rename from jonas/jonas/examples/alarm/web/images/tomcat.gif rename to jonas/examples/alarm/web/images/tomcat.gif diff --git a/jonas/jonas/examples/alarm/web/index.html b/jonas/examples/alarm/web/index.html similarity index 100% rename from jonas/jonas/examples/alarm/web/index.html rename to jonas/examples/alarm/web/index.html diff --git a/jonas/jonas/examples/alarm/web/secured/createfilter.jsp b/jonas/examples/alarm/web/secured/createfilter.jsp similarity index 100% rename from jonas/jonas/examples/alarm/web/secured/createfilter.jsp rename to jonas/examples/alarm/web/secured/createfilter.jsp diff --git a/jonas/jonas/examples/alarm/web/secured/current.jsp b/jonas/examples/alarm/web/secured/current.jsp similarity index 100% rename from jonas/jonas/examples/alarm/web/secured/current.jsp rename to jonas/examples/alarm/web/secured/current.jsp diff --git a/jonas/jonas/examples/alarm/web/secured/list.jsp b/jonas/examples/alarm/web/secured/list.jsp similarity index 100% rename from jonas/jonas/examples/alarm/web/secured/list.jsp rename to jonas/examples/alarm/web/secured/list.jsp diff --git a/jonas/jonas/examples/alarm/web/secured/remove.jsp b/jonas/examples/alarm/web/secured/remove.jsp similarity index 100% rename from jonas/jonas/examples/alarm/web/secured/remove.jsp rename to jonas/examples/alarm/web/secured/remove.jsp diff --git a/jonas/jonas/examples/alarm/web/secured/removefilter.jsp b/jonas/examples/alarm/web/secured/removefilter.jsp similarity index 100% rename from jonas/jonas/examples/alarm/web/secured/removefilter.jsp rename to jonas/examples/alarm/web/secured/removefilter.jsp diff --git a/jonas/jonas/examples/alarm/web/secured/setfilter.jsp b/jonas/examples/alarm/web/secured/setfilter.jsp similarity index 100% rename from jonas/jonas/examples/alarm/web/secured/setfilter.jsp rename to jonas/examples/alarm/web/secured/setfilter.jsp diff --git a/jonas/jonas/examples/alarm/web/secured/top.html b/jonas/examples/alarm/web/secured/top.html similarity index 100% rename from jonas/jonas/examples/alarm/web/secured/top.html rename to jonas/examples/alarm/web/secured/top.html diff --git a/jonas/jonas/examples/alarm/web/secured/unsetfilter.jsp b/jonas/examples/alarm/web/secured/unsetfilter.jsp similarity index 100% rename from jonas/jonas/examples/alarm/web/secured/unsetfilter.jsp rename to jonas/examples/alarm/web/secured/unsetfilter.jsp diff --git a/jonas/jonas/examples/build.properties b/jonas/examples/build.properties similarity index 100% rename from jonas/jonas/examples/build.properties rename to jonas/examples/build.properties diff --git a/jonas/jonas/examples/build.xml b/jonas/examples/build.xml similarity index 100% rename from jonas/jonas/examples/build.xml rename to jonas/examples/build.xml diff --git a/jonas/jonas/examples/clusterDemo/README b/jonas/examples/clusterDemo/README similarity index 100% rename from jonas/jonas/examples/clusterDemo/README rename to jonas/examples/clusterDemo/README diff --git a/jonas/jonas/examples/clusterDemo/build.xml b/jonas/examples/clusterDemo/build.xml similarity index 100% rename from jonas/jonas/examples/clusterDemo/build.xml rename to jonas/examples/clusterDemo/build.xml diff --git a/jonas/jonas/examples/clusterDemo/client/org/objectweb/clusterDemo/BankClient.java b/jonas/examples/clusterDemo/client/org/objectweb/clusterDemo/BankClient.java similarity index 100% rename from jonas/jonas/examples/clusterDemo/client/org/objectweb/clusterDemo/BankClient.java rename to jonas/examples/clusterDemo/client/org/objectweb/clusterDemo/BankClient.java diff --git a/jonas/jonas/examples/clusterDemo/src/org/objectweb/clusterDemo/BankAccountECL.java b/jonas/examples/clusterDemo/src/org/objectweb/clusterDemo/BankAccountECL.java similarity index 100% rename from jonas/jonas/examples/clusterDemo/src/org/objectweb/clusterDemo/BankAccountECL.java rename to jonas/examples/clusterDemo/src/org/objectweb/clusterDemo/BankAccountECL.java diff --git a/jonas/jonas/examples/clusterDemo/src/org/objectweb/clusterDemo/BankAccountLocal.java b/jonas/examples/clusterDemo/src/org/objectweb/clusterDemo/BankAccountLocal.java similarity index 100% rename from jonas/jonas/examples/clusterDemo/src/org/objectweb/clusterDemo/BankAccountLocal.java rename to jonas/examples/clusterDemo/src/org/objectweb/clusterDemo/BankAccountLocal.java diff --git a/jonas/jonas/examples/clusterDemo/src/org/objectweb/clusterDemo/BankAccountLocalHome.java b/jonas/examples/clusterDemo/src/org/objectweb/clusterDemo/BankAccountLocalHome.java similarity index 100% rename from jonas/jonas/examples/clusterDemo/src/org/objectweb/clusterDemo/BankAccountLocalHome.java rename to jonas/examples/clusterDemo/src/org/objectweb/clusterDemo/BankAccountLocalHome.java diff --git a/jonas/jonas/examples/clusterDemo/src/org/objectweb/clusterDemo/BankOperationECL.java b/jonas/examples/clusterDemo/src/org/objectweb/clusterDemo/BankOperationECL.java similarity index 100% rename from jonas/jonas/examples/clusterDemo/src/org/objectweb/clusterDemo/BankOperationECL.java rename to jonas/examples/clusterDemo/src/org/objectweb/clusterDemo/BankOperationECL.java diff --git a/jonas/jonas/examples/clusterDemo/src/org/objectweb/clusterDemo/BankOperationLocal.java b/jonas/examples/clusterDemo/src/org/objectweb/clusterDemo/BankOperationLocal.java similarity index 100% rename from jonas/jonas/examples/clusterDemo/src/org/objectweb/clusterDemo/BankOperationLocal.java rename to jonas/examples/clusterDemo/src/org/objectweb/clusterDemo/BankOperationLocal.java diff --git a/jonas/jonas/examples/clusterDemo/src/org/objectweb/clusterDemo/BankOperationLocalHome.java b/jonas/examples/clusterDemo/src/org/objectweb/clusterDemo/BankOperationLocalHome.java similarity index 100% rename from jonas/jonas/examples/clusterDemo/src/org/objectweb/clusterDemo/BankOperationLocalHome.java rename to jonas/examples/clusterDemo/src/org/objectweb/clusterDemo/BankOperationLocalHome.java diff --git a/jonas/jonas/examples/clusterDemo/src/org/objectweb/clusterDemo/BankSession.java b/jonas/examples/clusterDemo/src/org/objectweb/clusterDemo/BankSession.java similarity index 100% rename from jonas/jonas/examples/clusterDemo/src/org/objectweb/clusterDemo/BankSession.java rename to jonas/examples/clusterDemo/src/org/objectweb/clusterDemo/BankSession.java diff --git a/jonas/jonas/examples/clusterDemo/src/org/objectweb/clusterDemo/BankSessionHome.java b/jonas/examples/clusterDemo/src/org/objectweb/clusterDemo/BankSessionHome.java similarity index 100% rename from jonas/jonas/examples/clusterDemo/src/org/objectweb/clusterDemo/BankSessionHome.java rename to jonas/examples/clusterDemo/src/org/objectweb/clusterDemo/BankSessionHome.java diff --git a/jonas/jonas/examples/clusterDemo/src/org/objectweb/clusterDemo/BankSessionSLR.java b/jonas/examples/clusterDemo/src/org/objectweb/clusterDemo/BankSessionSLR.java similarity index 100% rename from jonas/jonas/examples/clusterDemo/src/org/objectweb/clusterDemo/BankSessionSLR.java rename to jonas/examples/clusterDemo/src/org/objectweb/clusterDemo/BankSessionSLR.java diff --git a/jonas/jonas/examples/clusterDemo/src/org/objectweb/clusterDemo/OperationJavaBean.java b/jonas/examples/clusterDemo/src/org/objectweb/clusterDemo/OperationJavaBean.java similarity index 100% rename from jonas/jonas/examples/clusterDemo/src/org/objectweb/clusterDemo/OperationJavaBean.java rename to jonas/examples/clusterDemo/src/org/objectweb/clusterDemo/OperationJavaBean.java diff --git a/jonas/jonas/examples/clusterDemo/src/org/objectweb/clusterDemo/clusterDemo.xml b/jonas/examples/clusterDemo/src/org/objectweb/clusterDemo/clusterDemo.xml similarity index 100% rename from jonas/jonas/examples/clusterDemo/src/org/objectweb/clusterDemo/clusterDemo.xml rename to jonas/examples/clusterDemo/src/org/objectweb/clusterDemo/clusterDemo.xml diff --git a/jonas/jonas/examples/clusterDemo/src/org/objectweb/clusterDemo/jonas-clusterDemo.xml b/jonas/examples/clusterDemo/src/org/objectweb/clusterDemo/jonas-clusterDemo.xml similarity index 100% rename from jonas/jonas/examples/clusterDemo/src/org/objectweb/clusterDemo/jonas-clusterDemo.xml rename to jonas/examples/clusterDemo/src/org/objectweb/clusterDemo/jonas-clusterDemo.xml diff --git a/jonas/jonas/examples/cmp2/README b/jonas/examples/cmp2/README similarity index 100% rename from jonas/jonas/examples/cmp2/README rename to jonas/examples/cmp2/README diff --git a/jonas/jonas/examples/cmp2/build.xml b/jonas/examples/cmp2/build.xml similarity index 100% rename from jonas/jonas/examples/cmp2/build.xml rename to jonas/examples/cmp2/build.xml diff --git a/jonas/jonas/examples/cmp2/etc/resources/web/index.html b/jonas/examples/cmp2/etc/resources/web/index.html similarity index 100% rename from jonas/jonas/examples/cmp2/etc/resources/web/index.html rename to jonas/examples/cmp2/etc/resources/web/index.html diff --git a/jonas/jonas/examples/cmp2/etc/resources/web/style.css b/jonas/examples/cmp2/etc/resources/web/style.css similarity index 100% rename from jonas/jonas/examples/cmp2/etc/resources/web/style.css rename to jonas/examples/cmp2/etc/resources/web/style.css diff --git a/jonas/jonas/examples/cmp2/etc/xml/application.xml b/jonas/examples/cmp2/etc/xml/application.xml similarity index 100% rename from jonas/jonas/examples/cmp2/etc/xml/application.xml rename to jonas/examples/cmp2/etc/xml/application.xml diff --git a/jonas/jonas/examples/cmp2/etc/xml/cmp2.xml b/jonas/examples/cmp2/etc/xml/cmp2.xml similarity index 100% rename from jonas/jonas/examples/cmp2/etc/xml/cmp2.xml rename to jonas/examples/cmp2/etc/xml/cmp2.xml diff --git a/jonas/jonas/examples/cmp2/etc/xml/jonas-cmp2.xml b/jonas/examples/cmp2/etc/xml/jonas-cmp2.xml similarity index 100% rename from jonas/jonas/examples/cmp2/etc/xml/jonas-cmp2.xml rename to jonas/examples/cmp2/etc/xml/jonas-cmp2.xml diff --git a/jonas/jonas/examples/cmp2/etc/xml/web.xml b/jonas/examples/cmp2/etc/xml/web.xml similarity index 100% rename from jonas/jonas/examples/cmp2/etc/xml/web.xml rename to jonas/examples/cmp2/etc/xml/web.xml diff --git a/jonas/jonas/examples/cmp2/src/com/titan/address/AddressBean.java b/jonas/examples/cmp2/src/com/titan/address/AddressBean.java similarity index 100% rename from jonas/jonas/examples/cmp2/src/com/titan/address/AddressBean.java rename to jonas/examples/cmp2/src/com/titan/address/AddressBean.java diff --git a/jonas/jonas/examples/cmp2/src/com/titan/address/AddressHomeLocal.java b/jonas/examples/cmp2/src/com/titan/address/AddressHomeLocal.java similarity index 100% rename from jonas/jonas/examples/cmp2/src/com/titan/address/AddressHomeLocal.java rename to jonas/examples/cmp2/src/com/titan/address/AddressHomeLocal.java diff --git a/jonas/jonas/examples/cmp2/src/com/titan/address/AddressLocal.java b/jonas/examples/cmp2/src/com/titan/address/AddressLocal.java similarity index 100% rename from jonas/jonas/examples/cmp2/src/com/titan/address/AddressLocal.java rename to jonas/examples/cmp2/src/com/titan/address/AddressLocal.java diff --git a/jonas/jonas/examples/cmp2/src/com/titan/cabin/CabinBean.java b/jonas/examples/cmp2/src/com/titan/cabin/CabinBean.java similarity index 100% rename from jonas/jonas/examples/cmp2/src/com/titan/cabin/CabinBean.java rename to jonas/examples/cmp2/src/com/titan/cabin/CabinBean.java diff --git a/jonas/jonas/examples/cmp2/src/com/titan/cabin/CabinHomeLocal.java b/jonas/examples/cmp2/src/com/titan/cabin/CabinHomeLocal.java similarity index 100% rename from jonas/jonas/examples/cmp2/src/com/titan/cabin/CabinHomeLocal.java rename to jonas/examples/cmp2/src/com/titan/cabin/CabinHomeLocal.java diff --git a/jonas/jonas/examples/cmp2/src/com/titan/cabin/CabinHomeRemote.java b/jonas/examples/cmp2/src/com/titan/cabin/CabinHomeRemote.java similarity index 100% rename from jonas/jonas/examples/cmp2/src/com/titan/cabin/CabinHomeRemote.java rename to jonas/examples/cmp2/src/com/titan/cabin/CabinHomeRemote.java diff --git a/jonas/jonas/examples/cmp2/src/com/titan/cabin/CabinLocal.java b/jonas/examples/cmp2/src/com/titan/cabin/CabinLocal.java similarity index 100% rename from jonas/jonas/examples/cmp2/src/com/titan/cabin/CabinLocal.java rename to jonas/examples/cmp2/src/com/titan/cabin/CabinLocal.java diff --git a/jonas/jonas/examples/cmp2/src/com/titan/cabin/CabinRemote.java b/jonas/examples/cmp2/src/com/titan/cabin/CabinRemote.java similarity index 100% rename from jonas/jonas/examples/cmp2/src/com/titan/cabin/CabinRemote.java rename to jonas/examples/cmp2/src/com/titan/cabin/CabinRemote.java diff --git a/jonas/jonas/examples/cmp2/src/com/titan/cruise/CruiseBean.java b/jonas/examples/cmp2/src/com/titan/cruise/CruiseBean.java similarity index 100% rename from jonas/jonas/examples/cmp2/src/com/titan/cruise/CruiseBean.java rename to jonas/examples/cmp2/src/com/titan/cruise/CruiseBean.java diff --git a/jonas/jonas/examples/cmp2/src/com/titan/cruise/CruiseHomeLocal.java b/jonas/examples/cmp2/src/com/titan/cruise/CruiseHomeLocal.java similarity index 100% rename from jonas/jonas/examples/cmp2/src/com/titan/cruise/CruiseHomeLocal.java rename to jonas/examples/cmp2/src/com/titan/cruise/CruiseHomeLocal.java diff --git a/jonas/jonas/examples/cmp2/src/com/titan/cruise/CruiseLocal.java b/jonas/examples/cmp2/src/com/titan/cruise/CruiseLocal.java similarity index 100% rename from jonas/jonas/examples/cmp2/src/com/titan/cruise/CruiseLocal.java rename to jonas/examples/cmp2/src/com/titan/cruise/CruiseLocal.java diff --git a/jonas/jonas/examples/cmp2/src/com/titan/customer/AddressDO.java b/jonas/examples/cmp2/src/com/titan/customer/AddressDO.java similarity index 100% rename from jonas/jonas/examples/cmp2/src/com/titan/customer/AddressDO.java rename to jonas/examples/cmp2/src/com/titan/customer/AddressDO.java diff --git a/jonas/jonas/examples/cmp2/src/com/titan/customer/CreditCardBean.java b/jonas/examples/cmp2/src/com/titan/customer/CreditCardBean.java similarity index 100% rename from jonas/jonas/examples/cmp2/src/com/titan/customer/CreditCardBean.java rename to jonas/examples/cmp2/src/com/titan/customer/CreditCardBean.java diff --git a/jonas/jonas/examples/cmp2/src/com/titan/customer/CreditCardHomeLocal.java b/jonas/examples/cmp2/src/com/titan/customer/CreditCardHomeLocal.java similarity index 100% rename from jonas/jonas/examples/cmp2/src/com/titan/customer/CreditCardHomeLocal.java rename to jonas/examples/cmp2/src/com/titan/customer/CreditCardHomeLocal.java diff --git a/jonas/jonas/examples/cmp2/src/com/titan/customer/CreditCardLocal.java b/jonas/examples/cmp2/src/com/titan/customer/CreditCardLocal.java similarity index 100% rename from jonas/jonas/examples/cmp2/src/com/titan/customer/CreditCardLocal.java rename to jonas/examples/cmp2/src/com/titan/customer/CreditCardLocal.java diff --git a/jonas/jonas/examples/cmp2/src/com/titan/customer/CustomerBean.java b/jonas/examples/cmp2/src/com/titan/customer/CustomerBean.java similarity index 100% rename from jonas/jonas/examples/cmp2/src/com/titan/customer/CustomerBean.java rename to jonas/examples/cmp2/src/com/titan/customer/CustomerBean.java diff --git a/jonas/jonas/examples/cmp2/src/com/titan/customer/CustomerHomeLocal.java b/jonas/examples/cmp2/src/com/titan/customer/CustomerHomeLocal.java similarity index 100% rename from jonas/jonas/examples/cmp2/src/com/titan/customer/CustomerHomeLocal.java rename to jonas/examples/cmp2/src/com/titan/customer/CustomerHomeLocal.java diff --git a/jonas/jonas/examples/cmp2/src/com/titan/customer/CustomerHomeRemote.java b/jonas/examples/cmp2/src/com/titan/customer/CustomerHomeRemote.java similarity index 100% rename from jonas/jonas/examples/cmp2/src/com/titan/customer/CustomerHomeRemote.java rename to jonas/examples/cmp2/src/com/titan/customer/CustomerHomeRemote.java diff --git a/jonas/jonas/examples/cmp2/src/com/titan/customer/CustomerLocal.java b/jonas/examples/cmp2/src/com/titan/customer/CustomerLocal.java similarity index 100% rename from jonas/jonas/examples/cmp2/src/com/titan/customer/CustomerLocal.java rename to jonas/examples/cmp2/src/com/titan/customer/CustomerLocal.java diff --git a/jonas/jonas/examples/cmp2/src/com/titan/customer/CustomerRemote.java b/jonas/examples/cmp2/src/com/titan/customer/CustomerRemote.java similarity index 100% rename from jonas/jonas/examples/cmp2/src/com/titan/customer/CustomerRemote.java rename to jonas/examples/cmp2/src/com/titan/customer/CustomerRemote.java diff --git a/jonas/jonas/examples/cmp2/src/com/titan/customer/Name.java b/jonas/examples/cmp2/src/com/titan/customer/Name.java similarity index 100% rename from jonas/jonas/examples/cmp2/src/com/titan/customer/Name.java rename to jonas/examples/cmp2/src/com/titan/customer/Name.java diff --git a/jonas/jonas/examples/cmp2/src/com/titan/phone/PhoneBean.java b/jonas/examples/cmp2/src/com/titan/phone/PhoneBean.java similarity index 100% rename from jonas/jonas/examples/cmp2/src/com/titan/phone/PhoneBean.java rename to jonas/examples/cmp2/src/com/titan/phone/PhoneBean.java diff --git a/jonas/jonas/examples/cmp2/src/com/titan/phone/PhoneHomeLocal.java b/jonas/examples/cmp2/src/com/titan/phone/PhoneHomeLocal.java similarity index 100% rename from jonas/jonas/examples/cmp2/src/com/titan/phone/PhoneHomeLocal.java rename to jonas/examples/cmp2/src/com/titan/phone/PhoneHomeLocal.java diff --git a/jonas/jonas/examples/cmp2/src/com/titan/phone/PhoneLocal.java b/jonas/examples/cmp2/src/com/titan/phone/PhoneLocal.java similarity index 100% rename from jonas/jonas/examples/cmp2/src/com/titan/phone/PhoneLocal.java rename to jonas/examples/cmp2/src/com/titan/phone/PhoneLocal.java diff --git a/jonas/jonas/examples/cmp2/src/com/titan/reservation/ReservationBean.java b/jonas/examples/cmp2/src/com/titan/reservation/ReservationBean.java similarity index 100% rename from jonas/jonas/examples/cmp2/src/com/titan/reservation/ReservationBean.java rename to jonas/examples/cmp2/src/com/titan/reservation/ReservationBean.java diff --git a/jonas/jonas/examples/cmp2/src/com/titan/reservation/ReservationHomeLocal.java b/jonas/examples/cmp2/src/com/titan/reservation/ReservationHomeLocal.java similarity index 100% rename from jonas/jonas/examples/cmp2/src/com/titan/reservation/ReservationHomeLocal.java rename to jonas/examples/cmp2/src/com/titan/reservation/ReservationHomeLocal.java diff --git a/jonas/jonas/examples/cmp2/src/com/titan/reservation/ReservationLocal.java b/jonas/examples/cmp2/src/com/titan/reservation/ReservationLocal.java similarity index 100% rename from jonas/jonas/examples/cmp2/src/com/titan/reservation/ReservationLocal.java rename to jonas/examples/cmp2/src/com/titan/reservation/ReservationLocal.java diff --git a/jonas/jonas/examples/cmp2/src/com/titan/ship/ShipBean.java b/jonas/examples/cmp2/src/com/titan/ship/ShipBean.java similarity index 100% rename from jonas/jonas/examples/cmp2/src/com/titan/ship/ShipBean.java rename to jonas/examples/cmp2/src/com/titan/ship/ShipBean.java diff --git a/jonas/jonas/examples/cmp2/src/com/titan/ship/ShipHomeLocal.java b/jonas/examples/cmp2/src/com/titan/ship/ShipHomeLocal.java similarity index 100% rename from jonas/jonas/examples/cmp2/src/com/titan/ship/ShipHomeLocal.java rename to jonas/examples/cmp2/src/com/titan/ship/ShipHomeLocal.java diff --git a/jonas/jonas/examples/cmp2/src/com/titan/ship/ShipLocal.java b/jonas/examples/cmp2/src/com/titan/ship/ShipLocal.java similarity index 100% rename from jonas/jonas/examples/cmp2/src/com/titan/ship/ShipLocal.java rename to jonas/examples/cmp2/src/com/titan/ship/ShipLocal.java diff --git a/jonas/jonas/examples/cmp2/src/com/titan/travelagent/RTravelAgentBean.java b/jonas/examples/cmp2/src/com/titan/travelagent/RTravelAgentBean.java similarity index 100% rename from jonas/jonas/examples/cmp2/src/com/titan/travelagent/RTravelAgentBean.java rename to jonas/examples/cmp2/src/com/titan/travelagent/RTravelAgentBean.java diff --git a/jonas/jonas/examples/cmp2/src/com/titan/travelagent/RTravelAgentHomeRemote.java b/jonas/examples/cmp2/src/com/titan/travelagent/RTravelAgentHomeRemote.java similarity index 100% rename from jonas/jonas/examples/cmp2/src/com/titan/travelagent/RTravelAgentHomeRemote.java rename to jonas/examples/cmp2/src/com/titan/travelagent/RTravelAgentHomeRemote.java diff --git a/jonas/jonas/examples/cmp2/src/com/titan/travelagent/RTravelAgentRemote.java b/jonas/examples/cmp2/src/com/titan/travelagent/RTravelAgentRemote.java similarity index 100% rename from jonas/jonas/examples/cmp2/src/com/titan/travelagent/RTravelAgentRemote.java rename to jonas/examples/cmp2/src/com/titan/travelagent/RTravelAgentRemote.java diff --git a/jonas/jonas/examples/cmp2/src/com/titan/travelagent/TravelAgentBean.java b/jonas/examples/cmp2/src/com/titan/travelagent/TravelAgentBean.java similarity index 100% rename from jonas/jonas/examples/cmp2/src/com/titan/travelagent/TravelAgentBean.java rename to jonas/examples/cmp2/src/com/titan/travelagent/TravelAgentBean.java diff --git a/jonas/jonas/examples/cmp2/src/com/titan/travelagent/TravelAgentHomeRemote.java b/jonas/examples/cmp2/src/com/titan/travelagent/TravelAgentHomeRemote.java similarity index 100% rename from jonas/jonas/examples/cmp2/src/com/titan/travelagent/TravelAgentHomeRemote.java rename to jonas/examples/cmp2/src/com/titan/travelagent/TravelAgentHomeRemote.java diff --git a/jonas/jonas/examples/cmp2/src/com/titan/travelagent/TravelAgentRemote.java b/jonas/examples/cmp2/src/com/titan/travelagent/TravelAgentRemote.java similarity index 100% rename from jonas/jonas/examples/cmp2/src/com/titan/travelagent/TravelAgentRemote.java rename to jonas/examples/cmp2/src/com/titan/travelagent/TravelAgentRemote.java diff --git a/jonas/jonas/examples/cmp2/src/servlets/ServletTest.java b/jonas/examples/cmp2/src/servlets/ServletTest.java similarity index 100% rename from jonas/jonas/examples/cmp2/src/servlets/ServletTest.java rename to jonas/examples/cmp2/src/servlets/ServletTest.java diff --git a/jonas/jonas/examples/cmp2/src/servlets/ServletTest2.java b/jonas/examples/cmp2/src/servlets/ServletTest2.java similarity index 100% rename from jonas/jonas/examples/cmp2/src/servlets/ServletTest2.java rename to jonas/examples/cmp2/src/servlets/ServletTest2.java diff --git a/jonas/jonas/examples/cmp2/src/servlets/ServletTest3.java b/jonas/examples/cmp2/src/servlets/ServletTest3.java similarity index 100% rename from jonas/jonas/examples/cmp2/src/servlets/ServletTest3.java rename to jonas/examples/cmp2/src/servlets/ServletTest3.java diff --git a/jonas/jonas/examples/earsample/README b/jonas/examples/earsample/README similarity index 100% rename from jonas/jonas/examples/earsample/README rename to jonas/examples/earsample/README diff --git a/jonas/jonas/examples/earsample/build.xml b/jonas/examples/earsample/build.xml similarity index 100% rename from jonas/jonas/examples/earsample/build.xml rename to jonas/examples/earsample/build.xml diff --git a/jonas/jonas/examples/earsample/etc/resources/jaas/jaas.config b/jonas/examples/earsample/etc/resources/jaas/jaas.config similarity index 100% rename from jonas/jonas/examples/earsample/etc/resources/jaas/jaas.config rename to jonas/examples/earsample/etc/resources/jaas/jaas.config diff --git a/jonas/jonas/examples/earsample/etc/resources/web/img/jetty.gif b/jonas/examples/earsample/etc/resources/web/img/jetty.gif similarity index 100% rename from jonas/jonas/examples/earsample/etc/resources/web/img/jetty.gif rename to jonas/examples/earsample/etc/resources/web/img/jetty.gif diff --git a/jonas/jonas/examples/earsample/etc/resources/web/img/ow_jonas_logo.gif b/jonas/examples/earsample/etc/resources/web/img/ow_jonas_logo.gif similarity index 100% rename from jonas/jonas/examples/earsample/etc/resources/web/img/ow_jonas_logo.gif rename to jonas/examples/earsample/etc/resources/web/img/ow_jonas_logo.gif diff --git a/jonas/jonas/examples/earsample/etc/resources/web/img/ow_logo.png b/jonas/examples/earsample/etc/resources/web/img/ow_logo.png similarity index 100% rename from jonas/jonas/examples/earsample/etc/resources/web/img/ow_logo.png rename to jonas/examples/earsample/etc/resources/web/img/ow_logo.png diff --git a/jonas/jonas/examples/earsample/etc/resources/web/img/tomcat.gif b/jonas/examples/earsample/etc/resources/web/img/tomcat.gif similarity index 100% rename from jonas/jonas/examples/earsample/etc/resources/web/img/tomcat.gif rename to jonas/examples/earsample/etc/resources/web/img/tomcat.gif diff --git a/jonas/jonas/examples/earsample/etc/resources/web/img/valid-xhtml11.png b/jonas/examples/earsample/etc/resources/web/img/valid-xhtml11.png similarity index 100% rename from jonas/jonas/examples/earsample/etc/resources/web/img/valid-xhtml11.png rename to jonas/examples/earsample/etc/resources/web/img/valid-xhtml11.png diff --git a/jonas/jonas/examples/earsample/etc/resources/web/img/vcss.png b/jonas/examples/earsample/etc/resources/web/img/vcss.png similarity index 100% rename from jonas/jonas/examples/earsample/etc/resources/web/img/vcss.png rename to jonas/examples/earsample/etc/resources/web/img/vcss.png diff --git a/jonas/jonas/examples/earsample/etc/resources/web/index.html b/jonas/examples/earsample/etc/resources/web/index.html similarity index 100% rename from jonas/jonas/examples/earsample/etc/resources/web/index.html rename to jonas/examples/earsample/etc/resources/web/index.html diff --git a/jonas/jonas/examples/earsample/etc/resources/web/ow_jonas.css b/jonas/examples/earsample/etc/resources/web/ow_jonas.css similarity index 100% rename from jonas/jonas/examples/earsample/etc/resources/web/ow_jonas.css rename to jonas/examples/earsample/etc/resources/web/ow_jonas.css diff --git a/jonas/jonas/examples/earsample/etc/xml/application-client.xml b/jonas/examples/earsample/etc/xml/application-client.xml similarity index 100% rename from jonas/jonas/examples/earsample/etc/xml/application-client.xml rename to jonas/examples/earsample/etc/xml/application-client.xml diff --git a/jonas/jonas/examples/earsample/etc/xml/application.xml b/jonas/examples/earsample/etc/xml/application.xml similarity index 100% rename from jonas/jonas/examples/earsample/etc/xml/application.xml rename to jonas/examples/earsample/etc/xml/application.xml diff --git a/jonas/jonas/examples/earsample/etc/xml/jonas-client1.xml b/jonas/examples/earsample/etc/xml/jonas-client1.xml similarity index 100% rename from jonas/jonas/examples/earsample/etc/xml/jonas-client1.xml rename to jonas/examples/earsample/etc/xml/jonas-client1.xml diff --git a/jonas/jonas/examples/earsample/etc/xml/jonas-client2.xml b/jonas/examples/earsample/etc/xml/jonas-client2.xml similarity index 100% rename from jonas/jonas/examples/earsample/etc/xml/jonas-client2.xml rename to jonas/examples/earsample/etc/xml/jonas-client2.xml diff --git a/jonas/jonas/examples/earsample/etc/xml/jonas-secusb.xml b/jonas/examples/earsample/etc/xml/jonas-secusb.xml similarity index 100% rename from jonas/jonas/examples/earsample/etc/xml/jonas-secusb.xml rename to jonas/examples/earsample/etc/xml/jonas-secusb.xml diff --git a/jonas/jonas/examples/earsample/etc/xml/jonas-web.xml b/jonas/examples/earsample/etc/xml/jonas-web.xml similarity index 100% rename from jonas/jonas/examples/earsample/etc/xml/jonas-web.xml rename to jonas/examples/earsample/etc/xml/jonas-web.xml diff --git a/jonas/jonas/examples/earsample/etc/xml/ra.xml b/jonas/examples/earsample/etc/xml/ra.xml similarity index 100% rename from jonas/jonas/examples/earsample/etc/xml/ra.xml rename to jonas/examples/earsample/etc/xml/ra.xml diff --git a/jonas/jonas/examples/earsample/etc/xml/secusb.xml b/jonas/examples/earsample/etc/xml/secusb.xml similarity index 100% rename from jonas/jonas/examples/earsample/etc/xml/secusb.xml rename to jonas/examples/earsample/etc/xml/secusb.xml diff --git a/jonas/jonas/examples/earsample/etc/xml/web-jetty.xml b/jonas/examples/earsample/etc/xml/web-jetty.xml similarity index 100% rename from jonas/jonas/examples/earsample/etc/xml/web-jetty.xml rename to jonas/examples/earsample/etc/xml/web-jetty.xml diff --git a/jonas/jonas/examples/earsample/etc/xml/web.xml b/jonas/examples/earsample/etc/xml/web.xml similarity index 100% rename from jonas/jonas/examples/earsample/etc/xml/web.xml rename to jonas/examples/earsample/etc/xml/web.xml diff --git a/jonas/jonas/examples/earsample/src/org/objectweb/earsample/beans/secusb/Op.java b/jonas/examples/earsample/src/org/objectweb/earsample/beans/secusb/Op.java similarity index 100% rename from jonas/jonas/examples/earsample/src/org/objectweb/earsample/beans/secusb/Op.java rename to jonas/examples/earsample/src/org/objectweb/earsample/beans/secusb/Op.java diff --git a/jonas/jonas/examples/earsample/src/org/objectweb/earsample/beans/secusb/OpBean.java b/jonas/examples/earsample/src/org/objectweb/earsample/beans/secusb/OpBean.java similarity index 100% rename from jonas/jonas/examples/earsample/src/org/objectweb/earsample/beans/secusb/OpBean.java rename to jonas/examples/earsample/src/org/objectweb/earsample/beans/secusb/OpBean.java diff --git a/jonas/jonas/examples/earsample/src/org/objectweb/earsample/beans/secusb/OpHome.java b/jonas/examples/earsample/src/org/objectweb/earsample/beans/secusb/OpHome.java similarity index 100% rename from jonas/jonas/examples/earsample/src/org/objectweb/earsample/beans/secusb/OpHome.java rename to jonas/examples/earsample/src/org/objectweb/earsample/beans/secusb/OpHome.java diff --git a/jonas/jonas/examples/earsample/src/org/objectweb/earsample/beans/secusb/OpLocal.java b/jonas/examples/earsample/src/org/objectweb/earsample/beans/secusb/OpLocal.java similarity index 100% rename from jonas/jonas/examples/earsample/src/org/objectweb/earsample/beans/secusb/OpLocal.java rename to jonas/examples/earsample/src/org/objectweb/earsample/beans/secusb/OpLocal.java diff --git a/jonas/jonas/examples/earsample/src/org/objectweb/earsample/beans/secusb/OpLocalHome.java b/jonas/examples/earsample/src/org/objectweb/earsample/beans/secusb/OpLocalHome.java similarity index 100% rename from jonas/jonas/examples/earsample/src/org/objectweb/earsample/beans/secusb/OpLocalHome.java rename to jonas/examples/earsample/src/org/objectweb/earsample/beans/secusb/OpLocalHome.java diff --git a/jonas/jonas/examples/earsample/src/org/objectweb/earsample/clients/Client.java b/jonas/examples/earsample/src/org/objectweb/earsample/clients/Client.java similarity index 100% rename from jonas/jonas/examples/earsample/src/org/objectweb/earsample/clients/Client.java rename to jonas/examples/earsample/src/org/objectweb/earsample/clients/Client.java diff --git a/jonas/jonas/examples/earsample/src/org/objectweb/earsample/resourceadapters/ResourceAdapterImpl.java b/jonas/examples/earsample/src/org/objectweb/earsample/resourceadapters/ResourceAdapterImpl.java similarity index 100% rename from jonas/jonas/examples/earsample/src/org/objectweb/earsample/resourceadapters/ResourceAdapterImpl.java rename to jonas/examples/earsample/src/org/objectweb/earsample/resourceadapters/ResourceAdapterImpl.java diff --git a/jonas/jonas/examples/earsample/src/org/objectweb/earsample/servlets/ServletOp.java b/jonas/examples/earsample/src/org/objectweb/earsample/servlets/ServletOp.java similarity index 100% rename from jonas/jonas/examples/earsample/src/org/objectweb/earsample/servlets/ServletOp.java rename to jonas/examples/earsample/src/org/objectweb/earsample/servlets/ServletOp.java diff --git a/jonas/jonas/examples/emb-sample/.cvsignore b/jonas/examples/emb-sample/.cvsignore similarity index 100% rename from jonas/jonas/examples/emb-sample/.cvsignore rename to jonas/examples/emb-sample/.cvsignore diff --git a/jonas/jonas/examples/emb-sample/README b/jonas/examples/emb-sample/README similarity index 100% rename from jonas/jonas/examples/emb-sample/README rename to jonas/examples/emb-sample/README diff --git a/jonas/jonas/examples/emb-sample/build.xml b/jonas/examples/emb-sample/build.xml similarity index 100% rename from jonas/jonas/examples/emb-sample/build.xml rename to jonas/examples/emb-sample/build.xml diff --git a/jonas/jonas/examples/emb-sample/emb-core/README b/jonas/examples/emb-sample/emb-core/README similarity index 100% rename from jonas/jonas/examples/emb-sample/emb-core/README rename to jonas/examples/emb-sample/emb-core/README diff --git a/jonas/jonas/examples/emb-sample/etc/application.xml b/jonas/examples/emb-sample/etc/application.xml similarity index 100% rename from jonas/jonas/examples/emb-sample/etc/application.xml rename to jonas/examples/emb-sample/etc/application.xml diff --git a/jonas/jonas/examples/emb-sample/etc/embSampleSession.xml b/jonas/examples/emb-sample/etc/embSampleSession.xml similarity index 100% rename from jonas/jonas/examples/emb-sample/etc/embSampleSession.xml rename to jonas/examples/emb-sample/etc/embSampleSession.xml diff --git a/jonas/jonas/examples/emb-sample/etc/jonas-embSampleSession.xml b/jonas/examples/emb-sample/etc/jonas-embSampleSession.xml similarity index 100% rename from jonas/jonas/examples/emb-sample/etc/jonas-embSampleSession.xml rename to jonas/examples/emb-sample/etc/jonas-embSampleSession.xml diff --git a/jonas/jonas/examples/emb-sample/etc/web.xml b/jonas/examples/emb-sample/etc/web.xml similarity index 100% rename from jonas/jonas/examples/emb-sample/etc/web.xml rename to jonas/examples/emb-sample/etc/web.xml diff --git a/jonas/jonas/examples/emb-sample/plugins/README b/jonas/examples/emb-sample/plugins/README similarity index 100% rename from jonas/jonas/examples/emb-sample/plugins/README rename to jonas/examples/emb-sample/plugins/README diff --git a/jonas/jonas/examples/emb-sample/resources/icons/valid-xhtml11.png b/jonas/examples/emb-sample/resources/icons/valid-xhtml11.png similarity index 100% rename from jonas/jonas/examples/emb-sample/resources/icons/valid-xhtml11.png rename to jonas/examples/emb-sample/resources/icons/valid-xhtml11.png diff --git a/jonas/jonas/examples/emb-sample/resources/icons/vcss.png b/jonas/examples/emb-sample/resources/icons/vcss.png similarity index 100% rename from jonas/jonas/examples/emb-sample/resources/icons/vcss.png rename to jonas/examples/emb-sample/resources/icons/vcss.png diff --git a/jonas/jonas/examples/emb-sample/resources/jsps/footer.jsp b/jonas/examples/emb-sample/resources/jsps/footer.jsp similarity index 100% rename from jonas/jonas/examples/emb-sample/resources/jsps/footer.jsp rename to jonas/examples/emb-sample/resources/jsps/footer.jsp diff --git a/jonas/jonas/examples/emb-sample/resources/jsps/header.jsp b/jonas/examples/emb-sample/resources/jsps/header.jsp similarity index 100% rename from jonas/jonas/examples/emb-sample/resources/jsps/header.jsp rename to jonas/examples/emb-sample/resources/jsps/header.jsp diff --git a/jonas/jonas/examples/emb-sample/resources/jsps/mediaList.jsp b/jonas/examples/emb-sample/resources/jsps/mediaList.jsp similarity index 100% rename from jonas/jonas/examples/emb-sample/resources/jsps/mediaList.jsp rename to jonas/examples/emb-sample/resources/jsps/mediaList.jsp diff --git a/jonas/jonas/examples/emb-sample/resources/jsps/navigation.jsp b/jonas/examples/emb-sample/resources/jsps/navigation.jsp similarity index 100% rename from jonas/jonas/examples/emb-sample/resources/jsps/navigation.jsp rename to jonas/examples/emb-sample/resources/jsps/navigation.jsp diff --git a/jonas/jonas/examples/emb-sample/resources/jsps/templatePage.jsp b/jonas/examples/emb-sample/resources/jsps/templatePage.jsp similarity index 100% rename from jonas/jonas/examples/emb-sample/resources/jsps/templatePage.jsp rename to jonas/examples/emb-sample/resources/jsps/templatePage.jsp diff --git a/jonas/jonas/examples/emb-sample/resources/jsps/uploadForm.jsp b/jonas/examples/emb-sample/resources/jsps/uploadForm.jsp similarity index 100% rename from jonas/jonas/examples/emb-sample/resources/jsps/uploadForm.jsp rename to jonas/examples/emb-sample/resources/jsps/uploadForm.jsp diff --git a/jonas/jonas/examples/emb-sample/resources/samples/Java_CompatEE.gif b/jonas/examples/emb-sample/resources/samples/Java_CompatEE.gif similarity index 100% rename from jonas/jonas/examples/emb-sample/resources/samples/Java_CompatEE.gif rename to jonas/examples/emb-sample/resources/samples/Java_CompatEE.gif diff --git a/jonas/jonas/examples/emb-sample/resources/samples/apache.svg b/jonas/examples/emb-sample/resources/samples/apache.svg similarity index 100% rename from jonas/jonas/examples/emb-sample/resources/samples/apache.svg rename to jonas/examples/emb-sample/resources/samples/apache.svg diff --git a/jonas/jonas/examples/emb-sample/resources/samples/frame.png b/jonas/examples/emb-sample/resources/samples/frame.png similarity index 100% rename from jonas/jonas/examples/emb-sample/resources/samples/frame.png rename to jonas/examples/emb-sample/resources/samples/frame.png diff --git a/jonas/jonas/examples/emb-sample/resources/samples/iss-fireworks.mp3 b/jonas/examples/emb-sample/resources/samples/iss-fireworks.mp3 similarity index 100% rename from jonas/jonas/examples/emb-sample/resources/samples/iss-fireworks.mp3 rename to jonas/examples/emb-sample/resources/samples/iss-fireworks.mp3 diff --git a/jonas/jonas/examples/emb-sample/resources/samples/jonas.mp4 b/jonas/examples/emb-sample/resources/samples/jonas.mp4 similarity index 100% rename from jonas/jonas/examples/emb-sample/resources/samples/jonas.mp4 rename to jonas/examples/emb-sample/resources/samples/jonas.mp4 diff --git a/jonas/jonas/examples/emb-sample/resources/samples/jonas.png b/jonas/examples/emb-sample/resources/samples/jonas.png similarity index 100% rename from jonas/jonas/examples/emb-sample/resources/samples/jonas.png rename to jonas/examples/emb-sample/resources/samples/jonas.png diff --git a/jonas/jonas/examples/emb-sample/resources/samples/mask.png b/jonas/examples/emb-sample/resources/samples/mask.png similarity index 100% rename from jonas/jonas/examples/emb-sample/resources/samples/mask.png rename to jonas/examples/emb-sample/resources/samples/mask.png diff --git a/jonas/jonas/examples/emb-sample/resources/samples/objectweb.png b/jonas/examples/emb-sample/resources/samples/objectweb.png similarity index 100% rename from jonas/jonas/examples/emb-sample/resources/samples/objectweb.png rename to jonas/examples/emb-sample/resources/samples/objectweb.png diff --git a/jonas/jonas/examples/emb-sample/resources/samples/samples.properties b/jonas/examples/emb-sample/resources/samples/samples.properties similarity index 100% rename from jonas/jonas/examples/emb-sample/resources/samples/samples.properties rename to jonas/examples/emb-sample/resources/samples/samples.properties diff --git a/jonas/jonas/examples/emb-sample/resources/samples/snow.jpg b/jonas/examples/emb-sample/resources/samples/snow.jpg similarity index 100% rename from jonas/jonas/examples/emb-sample/resources/samples/snow.jpg rename to jonas/examples/emb-sample/resources/samples/snow.jpg diff --git a/jonas/jonas/examples/emb-sample/resources/samples/starfish.jpg b/jonas/examples/emb-sample/resources/samples/starfish.jpg similarity index 100% rename from jonas/jonas/examples/emb-sample/resources/samples/starfish.jpg rename to jonas/examples/emb-sample/resources/samples/starfish.jpg diff --git a/jonas/jonas/examples/emb-sample/resources/samples/white-valley.jpg b/jonas/examples/emb-sample/resources/samples/white-valley.jpg similarity index 100% rename from jonas/jonas/examples/emb-sample/resources/samples/white-valley.jpg rename to jonas/examples/emb-sample/resources/samples/white-valley.jpg diff --git a/jonas/jonas/examples/emb-sample/resources/theme/style.css b/jonas/examples/emb-sample/resources/theme/style.css similarity index 100% rename from jonas/jonas/examples/emb-sample/resources/theme/style.css rename to jonas/examples/emb-sample/resources/theme/style.css diff --git a/jonas/jonas/examples/emb-sample/src/emb/sample/MediaSampleException.java b/jonas/examples/emb-sample/src/emb/sample/MediaSampleException.java similarity index 100% rename from jonas/jonas/examples/emb-sample/src/emb/sample/MediaSampleException.java rename to jonas/examples/emb-sample/src/emb/sample/MediaSampleException.java diff --git a/jonas/jonas/examples/emb-sample/src/emb/sample/servlet/ActionDispatcher.java b/jonas/examples/emb-sample/src/emb/sample/servlet/ActionDispatcher.java similarity index 100% rename from jonas/jonas/examples/emb-sample/src/emb/sample/servlet/ActionDispatcher.java rename to jonas/examples/emb-sample/src/emb/sample/servlet/ActionDispatcher.java diff --git a/jonas/jonas/examples/emb-sample/src/emb/sample/servlet/BaseSampleServlet.java b/jonas/examples/emb-sample/src/emb/sample/servlet/BaseSampleServlet.java similarity index 100% rename from jonas/jonas/examples/emb-sample/src/emb/sample/servlet/BaseSampleServlet.java rename to jonas/examples/emb-sample/src/emb/sample/servlet/BaseSampleServlet.java diff --git a/jonas/jonas/examples/emb-sample/src/emb/sample/servlet/ConvertSampleImageBW.java b/jonas/examples/emb-sample/src/emb/sample/servlet/ConvertSampleImageBW.java similarity index 100% rename from jonas/jonas/examples/emb-sample/src/emb/sample/servlet/ConvertSampleImageBW.java rename to jonas/examples/emb-sample/src/emb/sample/servlet/ConvertSampleImageBW.java diff --git a/jonas/jonas/examples/emb-sample/src/emb/sample/servlet/ConvertSampleImageChained.java b/jonas/examples/emb-sample/src/emb/sample/servlet/ConvertSampleImageChained.java similarity index 100% rename from jonas/jonas/examples/emb-sample/src/emb/sample/servlet/ConvertSampleImageChained.java rename to jonas/examples/emb-sample/src/emb/sample/servlet/ConvertSampleImageChained.java diff --git a/jonas/jonas/examples/emb-sample/src/emb/sample/servlet/ConvertSampleImageFormat.java b/jonas/examples/emb-sample/src/emb/sample/servlet/ConvertSampleImageFormat.java similarity index 100% rename from jonas/jonas/examples/emb-sample/src/emb/sample/servlet/ConvertSampleImageFormat.java rename to jonas/examples/emb-sample/src/emb/sample/servlet/ConvertSampleImageFormat.java diff --git a/jonas/jonas/examples/emb-sample/src/emb/sample/servlet/ConvertSampleImageFrame.java b/jonas/examples/emb-sample/src/emb/sample/servlet/ConvertSampleImageFrame.java similarity index 100% rename from jonas/jonas/examples/emb-sample/src/emb/sample/servlet/ConvertSampleImageFrame.java rename to jonas/examples/emb-sample/src/emb/sample/servlet/ConvertSampleImageFrame.java diff --git a/jonas/jonas/examples/emb-sample/src/emb/sample/servlet/ConvertSampleImageHalfSize.java b/jonas/examples/emb-sample/src/emb/sample/servlet/ConvertSampleImageHalfSize.java similarity index 100% rename from jonas/jonas/examples/emb-sample/src/emb/sample/servlet/ConvertSampleImageHalfSize.java rename to jonas/examples/emb-sample/src/emb/sample/servlet/ConvertSampleImageHalfSize.java diff --git a/jonas/jonas/examples/emb-sample/src/emb/sample/servlet/ConvertSampleImageOverlayed.java b/jonas/examples/emb-sample/src/emb/sample/servlet/ConvertSampleImageOverlayed.java similarity index 100% rename from jonas/jonas/examples/emb-sample/src/emb/sample/servlet/ConvertSampleImageOverlayed.java rename to jonas/examples/emb-sample/src/emb/sample/servlet/ConvertSampleImageOverlayed.java diff --git a/jonas/jonas/examples/emb-sample/src/emb/sample/servlet/ConvertSampleImageSvgToPng.java b/jonas/examples/emb-sample/src/emb/sample/servlet/ConvertSampleImageSvgToPng.java similarity index 100% rename from jonas/jonas/examples/emb-sample/src/emb/sample/servlet/ConvertSampleImageSvgToPng.java rename to jonas/examples/emb-sample/src/emb/sample/servlet/ConvertSampleImageSvgToPng.java diff --git a/jonas/jonas/examples/emb-sample/src/emb/sample/servlet/ConvertSampleVideoTo3GPP.java b/jonas/examples/emb-sample/src/emb/sample/servlet/ConvertSampleVideoTo3GPP.java similarity index 100% rename from jonas/jonas/examples/emb-sample/src/emb/sample/servlet/ConvertSampleVideoTo3GPP.java rename to jonas/examples/emb-sample/src/emb/sample/servlet/ConvertSampleVideoTo3GPP.java diff --git a/jonas/jonas/examples/emb-sample/src/emb/sample/servlet/ConvertSampleVideoToMpeg.java b/jonas/examples/emb-sample/src/emb/sample/servlet/ConvertSampleVideoToMpeg.java similarity index 100% rename from jonas/jonas/examples/emb-sample/src/emb/sample/servlet/ConvertSampleVideoToMpeg.java rename to jonas/examples/emb-sample/src/emb/sample/servlet/ConvertSampleVideoToMpeg.java diff --git a/jonas/jonas/examples/emb-sample/src/emb/sample/servlet/ConvertSampleVideoToMpegTs.java b/jonas/examples/emb-sample/src/emb/sample/servlet/ConvertSampleVideoToMpegTs.java similarity index 100% rename from jonas/jonas/examples/emb-sample/src/emb/sample/servlet/ConvertSampleVideoToMpegTs.java rename to jonas/examples/emb-sample/src/emb/sample/servlet/ConvertSampleVideoToMpegTs.java diff --git a/jonas/jonas/examples/emb-sample/src/emb/sample/servlet/ExtractHeaderData.java b/jonas/examples/emb-sample/src/emb/sample/servlet/ExtractHeaderData.java similarity index 100% rename from jonas/jonas/examples/emb-sample/src/emb/sample/servlet/ExtractHeaderData.java rename to jonas/examples/emb-sample/src/emb/sample/servlet/ExtractHeaderData.java diff --git a/jonas/jonas/examples/emb-sample/src/emb/sample/servlet/HomeSample.java b/jonas/examples/emb-sample/src/emb/sample/servlet/HomeSample.java similarity index 100% rename from jonas/jonas/examples/emb-sample/src/emb/sample/servlet/HomeSample.java rename to jonas/examples/emb-sample/src/emb/sample/servlet/HomeSample.java diff --git a/jonas/jonas/examples/emb-sample/src/emb/sample/servlet/HttpSessionMgr.java b/jonas/examples/emb-sample/src/emb/sample/servlet/HttpSessionMgr.java similarity index 100% rename from jonas/jonas/examples/emb-sample/src/emb/sample/servlet/HttpSessionMgr.java rename to jonas/examples/emb-sample/src/emb/sample/servlet/HttpSessionMgr.java diff --git a/jonas/jonas/examples/emb-sample/src/emb/sample/servlet/ListSampleMedia.java b/jonas/examples/emb-sample/src/emb/sample/servlet/ListSampleMedia.java similarity index 100% rename from jonas/jonas/examples/emb-sample/src/emb/sample/servlet/ListSampleMedia.java rename to jonas/examples/emb-sample/src/emb/sample/servlet/ListSampleMedia.java diff --git a/jonas/jonas/examples/emb-sample/src/emb/sample/servlet/LoadSampleMedia.java b/jonas/examples/emb-sample/src/emb/sample/servlet/LoadSampleMedia.java similarity index 100% rename from jonas/jonas/examples/emb-sample/src/emb/sample/servlet/LoadSampleMedia.java rename to jonas/examples/emb-sample/src/emb/sample/servlet/LoadSampleMedia.java diff --git a/jonas/jonas/examples/emb-sample/src/emb/sample/servlet/RetrieveSampleMedia.java b/jonas/examples/emb-sample/src/emb/sample/servlet/RetrieveSampleMedia.java similarity index 100% rename from jonas/jonas/examples/emb-sample/src/emb/sample/servlet/RetrieveSampleMedia.java rename to jonas/examples/emb-sample/src/emb/sample/servlet/RetrieveSampleMedia.java diff --git a/jonas/jonas/examples/emb-sample/src/emb/sample/servlet/UploadSampleMedia.java b/jonas/examples/emb-sample/src/emb/sample/servlet/UploadSampleMedia.java similarity index 100% rename from jonas/jonas/examples/emb-sample/src/emb/sample/servlet/UploadSampleMedia.java rename to jonas/examples/emb-sample/src/emb/sample/servlet/UploadSampleMedia.java diff --git a/jonas/jonas/examples/emb-sample/src/emb/sample/session/HttpSessionMgr.java b/jonas/examples/emb-sample/src/emb/sample/session/HttpSessionMgr.java similarity index 100% rename from jonas/jonas/examples/emb-sample/src/emb/sample/session/HttpSessionMgr.java rename to jonas/examples/emb-sample/src/emb/sample/session/HttpSessionMgr.java diff --git a/jonas/jonas/examples/emb-sample/src/emb/sample/session/MediaSampleSessionBean.java b/jonas/examples/emb-sample/src/emb/sample/session/MediaSampleSessionBean.java similarity index 100% rename from jonas/jonas/examples/emb-sample/src/emb/sample/session/MediaSampleSessionBean.java rename to jonas/examples/emb-sample/src/emb/sample/session/MediaSampleSessionBean.java diff --git a/jonas/jonas/examples/emb-sample/src/emb/sample/session/MediaSampleSessionLocal.java b/jonas/examples/emb-sample/src/emb/sample/session/MediaSampleSessionLocal.java similarity index 100% rename from jonas/jonas/examples/emb-sample/src/emb/sample/session/MediaSampleSessionLocal.java rename to jonas/examples/emb-sample/src/emb/sample/session/MediaSampleSessionLocal.java diff --git a/jonas/jonas/examples/emb-sample/src/emb/sample/session/MediaSampleSessionLocalHome.java b/jonas/examples/emb-sample/src/emb/sample/session/MediaSampleSessionLocalHome.java similarity index 100% rename from jonas/jonas/examples/emb-sample/src/emb/sample/session/MediaSampleSessionLocalHome.java rename to jonas/examples/emb-sample/src/emb/sample/session/MediaSampleSessionLocalHome.java diff --git a/jonas/jonas/examples/fdf/DoubleHost.fractal b/jonas/examples/fdf/DoubleHost.fractal similarity index 100% rename from jonas/jonas/examples/fdf/DoubleHost.fractal rename to jonas/examples/fdf/DoubleHost.fractal diff --git a/jonas/jonas/examples/fdf/DoubleHostJclust.fractal b/jonas/examples/fdf/DoubleHostJclust.fractal similarity index 100% rename from jonas/jonas/examples/fdf/DoubleHostJclust.fractal rename to jonas/examples/fdf/DoubleHostJclust.fractal diff --git a/jonas/jonas/examples/fdf/FDF.fractal b/jonas/examples/fdf/FDF.fractal similarity index 100% rename from jonas/jonas/examples/fdf/FDF.fractal rename to jonas/examples/fdf/FDF.fractal diff --git a/jonas/jonas/examples/fdf/GetLogs.fractal b/jonas/examples/fdf/GetLogs.fractal similarity index 100% rename from jonas/jonas/examples/fdf/GetLogs.fractal rename to jonas/examples/fdf/GetLogs.fractal diff --git a/jonas/jonas/examples/fdf/Main.fractal b/jonas/examples/fdf/Main.fractal similarity index 100% rename from jonas/jonas/examples/fdf/Main.fractal rename to jonas/examples/fdf/Main.fractal diff --git a/jonas/jonas/examples/fdf/Patch.fractal b/jonas/examples/fdf/Patch.fractal similarity index 100% rename from jonas/jonas/examples/fdf/Patch.fractal rename to jonas/examples/fdf/Patch.fractal diff --git a/jonas/jonas/examples/fdf/README b/jonas/examples/fdf/README similarity index 100% rename from jonas/jonas/examples/fdf/README rename to jonas/examples/fdf/README diff --git a/jonas/jonas/examples/fdf/SSH_SCP.fractal b/jonas/examples/fdf/SSH_SCP.fractal similarity index 100% rename from jonas/jonas/examples/fdf/SSH_SCP.fractal rename to jonas/examples/fdf/SSH_SCP.fractal diff --git a/jonas/jonas/examples/fdf/SingleHost.fractal b/jonas/examples/fdf/SingleHost.fractal similarity index 100% rename from jonas/jonas/examples/fdf/SingleHost.fractal rename to jonas/examples/fdf/SingleHost.fractal diff --git a/jonas/jonas/examples/fdf/Win_Telnet.fractal b/jonas/examples/fdf/Win_Telnet.fractal similarity index 100% rename from jonas/jonas/examples/fdf/Win_Telnet.fractal rename to jonas/examples/fdf/Win_Telnet.fractal diff --git a/jonas/jonas/examples/hibernate/README b/jonas/examples/hibernate/README similarity index 100% rename from jonas/jonas/examples/hibernate/README rename to jonas/examples/hibernate/README diff --git a/jonas/jonas/examples/hibernate/build.properties b/jonas/examples/hibernate/build.properties similarity index 100% rename from jonas/jonas/examples/hibernate/build.properties rename to jonas/examples/hibernate/build.properties diff --git a/jonas/jonas/examples/hibernate/build.xml b/jonas/examples/hibernate/build.xml similarity index 100% rename from jonas/jonas/examples/hibernate/build.xml rename to jonas/examples/hibernate/build.xml diff --git a/jonas/jonas/examples/hibernate/etc/resources/Cat.hbm.xml b/jonas/examples/hibernate/etc/resources/Cat.hbm.xml similarity index 100% rename from jonas/jonas/examples/hibernate/etc/resources/Cat.hbm.xml rename to jonas/examples/hibernate/etc/resources/Cat.hbm.xml diff --git a/jonas/jonas/examples/hibernate/etc/resources/hibernate.cfg.xml b/jonas/examples/hibernate/etc/resources/hibernate.cfg.xml similarity index 100% rename from jonas/jonas/examples/hibernate/etc/resources/hibernate.cfg.xml rename to jonas/examples/hibernate/etc/resources/hibernate.cfg.xml diff --git a/jonas/jonas/examples/hibernate/etc/sql/initdb.sql b/jonas/examples/hibernate/etc/sql/initdb.sql similarity index 100% rename from jonas/jonas/examples/hibernate/etc/sql/initdb.sql rename to jonas/examples/hibernate/etc/sql/initdb.sql diff --git a/jonas/jonas/examples/hibernate/etc/sql/resetdb.sql b/jonas/examples/hibernate/etc/sql/resetdb.sql similarity index 100% rename from jonas/jonas/examples/hibernate/etc/sql/resetdb.sql rename to jonas/examples/hibernate/etc/sql/resetdb.sql diff --git a/jonas/jonas/examples/hibernate/etc/xml/jonas-web.xml b/jonas/examples/hibernate/etc/xml/jonas-web.xml similarity index 100% rename from jonas/jonas/examples/hibernate/etc/xml/jonas-web.xml rename to jonas/examples/hibernate/etc/xml/jonas-web.xml diff --git a/jonas/jonas/examples/hibernate/etc/xml/web.xml b/jonas/examples/hibernate/etc/xml/web.xml similarity index 100% rename from jonas/jonas/examples/hibernate/etc/xml/web.xml rename to jonas/examples/hibernate/etc/xml/web.xml diff --git a/jonas/jonas/examples/hibernate/src/org/hibernate/examples/quickstart/Cat.java b/jonas/examples/hibernate/src/org/hibernate/examples/quickstart/Cat.java similarity index 100% rename from jonas/jonas/examples/hibernate/src/org/hibernate/examples/quickstart/Cat.java rename to jonas/examples/hibernate/src/org/hibernate/examples/quickstart/Cat.java diff --git a/jonas/jonas/examples/hibernate/src/org/hibernate/examples/quickstart/TestServlet.java b/jonas/examples/hibernate/src/org/hibernate/examples/quickstart/TestServlet.java similarity index 100% rename from jonas/jonas/examples/hibernate/src/org/hibernate/examples/quickstart/TestServlet.java rename to jonas/examples/hibernate/src/org/hibernate/examples/quickstart/TestServlet.java diff --git a/jonas/jonas/examples/j2eemanagement/README b/jonas/examples/j2eemanagement/README similarity index 100% rename from jonas/jonas/examples/j2eemanagement/README rename to jonas/examples/j2eemanagement/README diff --git a/jonas/jonas/examples/j2eemanagement/build.xml b/jonas/examples/j2eemanagement/build.xml similarity index 100% rename from jonas/jonas/examples/j2eemanagement/build.xml rename to jonas/examples/j2eemanagement/build.xml diff --git a/jonas/jonas/examples/j2eemanagement/etc/resources/web/img/logo_jonas.jpg b/jonas/examples/j2eemanagement/etc/resources/web/img/logo_jonas.jpg similarity index 100% rename from jonas/jonas/examples/j2eemanagement/etc/resources/web/img/logo_jonas.jpg rename to jonas/examples/j2eemanagement/etc/resources/web/img/logo_jonas.jpg diff --git a/jonas/jonas/examples/j2eemanagement/etc/resources/web/index.html b/jonas/examples/j2eemanagement/etc/resources/web/index.html similarity index 100% rename from jonas/jonas/examples/j2eemanagement/etc/resources/web/index.html rename to jonas/examples/j2eemanagement/etc/resources/web/index.html diff --git a/jonas/jonas/examples/j2eemanagement/etc/resources/web/style.css b/jonas/examples/j2eemanagement/etc/resources/web/style.css similarity index 100% rename from jonas/jonas/examples/j2eemanagement/etc/resources/web/style.css rename to jonas/examples/j2eemanagement/etc/resources/web/style.css diff --git a/jonas/jonas/examples/j2eemanagement/etc/xml/application.xml b/jonas/examples/j2eemanagement/etc/xml/application.xml similarity index 100% rename from jonas/jonas/examples/j2eemanagement/etc/xml/application.xml rename to jonas/examples/j2eemanagement/etc/xml/application.xml diff --git a/jonas/jonas/examples/j2eemanagement/etc/xml/jonas-web.xml b/jonas/examples/j2eemanagement/etc/xml/jonas-web.xml similarity index 100% rename from jonas/jonas/examples/j2eemanagement/etc/xml/jonas-web.xml rename to jonas/examples/j2eemanagement/etc/xml/jonas-web.xml diff --git a/jonas/jonas/examples/j2eemanagement/etc/xml/web.xml b/jonas/examples/j2eemanagement/etc/xml/web.xml similarity index 100% rename from jonas/jonas/examples/j2eemanagement/etc/xml/web.xml rename to jonas/examples/j2eemanagement/etc/xml/web.xml diff --git a/jonas/jonas/examples/j2eemanagement/src/org/objectweb/j2eemanagement/servlets/ClustMgmtServlet.java b/jonas/examples/j2eemanagement/src/org/objectweb/j2eemanagement/servlets/ClustMgmtServlet.java similarity index 100% rename from jonas/jonas/examples/j2eemanagement/src/org/objectweb/j2eemanagement/servlets/ClustMgmtServlet.java rename to jonas/examples/j2eemanagement/src/org/objectweb/j2eemanagement/servlets/ClustMgmtServlet.java diff --git a/jonas/jonas/examples/j2eemanagement/src/org/objectweb/j2eemanagement/servlets/ClusterDaemonServlet.java b/jonas/examples/j2eemanagement/src/org/objectweb/j2eemanagement/servlets/ClusterDaemonServlet.java similarity index 100% rename from jonas/jonas/examples/j2eemanagement/src/org/objectweb/j2eemanagement/servlets/ClusterDaemonServlet.java rename to jonas/examples/j2eemanagement/src/org/objectweb/j2eemanagement/servlets/ClusterDaemonServlet.java diff --git a/jonas/jonas/examples/j2eemanagement/src/org/objectweb/j2eemanagement/servlets/J2eemanagementBaseServlet.java b/jonas/examples/j2eemanagement/src/org/objectweb/j2eemanagement/servlets/J2eemanagementBaseServlet.java similarity index 100% rename from jonas/jonas/examples/j2eemanagement/src/org/objectweb/j2eemanagement/servlets/J2eemanagementBaseServlet.java rename to jonas/examples/j2eemanagement/src/org/objectweb/j2eemanagement/servlets/J2eemanagementBaseServlet.java diff --git a/jonas/jonas/examples/j2eemanagement/src/org/objectweb/j2eemanagement/servlets/JmsAdminServlet.java b/jonas/examples/j2eemanagement/src/org/objectweb/j2eemanagement/servlets/JmsAdminServlet.java similarity index 100% rename from jonas/jonas/examples/j2eemanagement/src/org/objectweb/j2eemanagement/servlets/JmsAdminServlet.java rename to jonas/examples/j2eemanagement/src/org/objectweb/j2eemanagement/servlets/JmsAdminServlet.java diff --git a/jonas/jonas/examples/j2eemanagement/src/org/objectweb/j2eemanagement/servlets/MgmtServlet.java b/jonas/examples/j2eemanagement/src/org/objectweb/j2eemanagement/servlets/MgmtServlet.java similarity index 100% rename from jonas/jonas/examples/j2eemanagement/src/org/objectweb/j2eemanagement/servlets/MgmtServlet.java rename to jonas/examples/j2eemanagement/src/org/objectweb/j2eemanagement/servlets/MgmtServlet.java diff --git a/jonas/jonas/examples/j2eemanagement/src/org/objectweb/j2eemanagement/servlets/MyListener.java b/jonas/examples/j2eemanagement/src/org/objectweb/j2eemanagement/servlets/MyListener.java similarity index 100% rename from jonas/jonas/examples/j2eemanagement/src/org/objectweb/j2eemanagement/servlets/MyListener.java rename to jonas/examples/j2eemanagement/src/org/objectweb/j2eemanagement/servlets/MyListener.java diff --git a/jonas/jonas/examples/j2eemanagement/src/org/objectweb/j2eemanagement/servlets/NewServerMgmtServlet.java b/jonas/examples/j2eemanagement/src/org/objectweb/j2eemanagement/servlets/NewServerMgmtServlet.java similarity index 100% rename from jonas/jonas/examples/j2eemanagement/src/org/objectweb/j2eemanagement/servlets/NewServerMgmtServlet.java rename to jonas/examples/j2eemanagement/src/org/objectweb/j2eemanagement/servlets/NewServerMgmtServlet.java diff --git a/jonas/jonas/examples/jaasclient/README b/jonas/examples/jaasclient/README similarity index 100% rename from jonas/jonas/examples/jaasclient/README rename to jonas/examples/jaasclient/README diff --git a/jonas/jonas/examples/jaasclient/build.xml b/jonas/examples/jaasclient/build.xml similarity index 100% rename from jonas/jonas/examples/jaasclient/build.xml rename to jonas/examples/jaasclient/build.xml diff --git a/jonas/jonas/examples/jaasclient/etc/xml/application-client-swing.xml b/jonas/examples/jaasclient/etc/xml/application-client-swing.xml similarity index 100% rename from jonas/jonas/examples/jaasclient/etc/xml/application-client-swing.xml rename to jonas/examples/jaasclient/etc/xml/application-client-swing.xml diff --git a/jonas/jonas/examples/jaasclient/etc/xml/application-client.xml b/jonas/examples/jaasclient/etc/xml/application-client.xml similarity index 100% rename from jonas/jonas/examples/jaasclient/etc/xml/application-client.xml rename to jonas/examples/jaasclient/etc/xml/application-client.xml diff --git a/jonas/jonas/examples/jaasclient/etc/xml/jonas-client1.xml b/jonas/examples/jaasclient/etc/xml/jonas-client1.xml similarity index 100% rename from jonas/jonas/examples/jaasclient/etc/xml/jonas-client1.xml rename to jonas/examples/jaasclient/etc/xml/jonas-client1.xml diff --git a/jonas/jonas/examples/jaasclient/etc/xml/jonas-client2.xml b/jonas/examples/jaasclient/etc/xml/jonas-client2.xml similarity index 100% rename from jonas/jonas/examples/jaasclient/etc/xml/jonas-client2.xml rename to jonas/examples/jaasclient/etc/xml/jonas-client2.xml diff --git a/jonas/jonas/examples/jaasclient/etc/xml/jonas-client3.xml b/jonas/examples/jaasclient/etc/xml/jonas-client3.xml similarity index 100% rename from jonas/jonas/examples/jaasclient/etc/xml/jonas-client3.xml rename to jonas/examples/jaasclient/etc/xml/jonas-client3.xml diff --git a/jonas/jonas/examples/jaasclient/etc/xml/jonas-secusb.xml b/jonas/examples/jaasclient/etc/xml/jonas-secusb.xml similarity index 100% rename from jonas/jonas/examples/jaasclient/etc/xml/jonas-secusb.xml rename to jonas/examples/jaasclient/etc/xml/jonas-secusb.xml diff --git a/jonas/jonas/examples/jaasclient/etc/xml/secusb.xml b/jonas/examples/jaasclient/etc/xml/secusb.xml similarity index 100% rename from jonas/jonas/examples/jaasclient/etc/xml/secusb.xml rename to jonas/examples/jaasclient/etc/xml/secusb.xml diff --git a/jonas/jonas/examples/jaasclient/src/jaasclient/ClientJAASOp.java b/jonas/examples/jaasclient/src/jaasclient/ClientJAASOp.java similarity index 100% rename from jonas/jonas/examples/jaasclient/src/jaasclient/ClientJAASOp.java rename to jonas/examples/jaasclient/src/jaasclient/ClientJAASOp.java diff --git a/jonas/jonas/examples/jaasclient/src/jaasclient/ClientJAASOpContClient.java b/jonas/examples/jaasclient/src/jaasclient/ClientJAASOpContClient.java similarity index 100% rename from jonas/jonas/examples/jaasclient/src/jaasclient/ClientJAASOpContClient.java rename to jonas/examples/jaasclient/src/jaasclient/ClientJAASOpContClient.java diff --git a/jonas/jonas/examples/jaasclient/src/jaasclient/ClientJAASOpContClientSwing.java b/jonas/examples/jaasclient/src/jaasclient/ClientJAASOpContClientSwing.java similarity index 100% rename from jonas/jonas/examples/jaasclient/src/jaasclient/ClientJAASOpContClientSwing.java rename to jonas/examples/jaasclient/src/jaasclient/ClientJAASOpContClientSwing.java diff --git a/jonas/jonas/examples/jaasclient/src/jaasclient/beans/secusb/JAASOp.java b/jonas/examples/jaasclient/src/jaasclient/beans/secusb/JAASOp.java similarity index 100% rename from jonas/jonas/examples/jaasclient/src/jaasclient/beans/secusb/JAASOp.java rename to jonas/examples/jaasclient/src/jaasclient/beans/secusb/JAASOp.java diff --git a/jonas/jonas/examples/jaasclient/src/jaasclient/beans/secusb/JAASOpBean.java b/jonas/examples/jaasclient/src/jaasclient/beans/secusb/JAASOpBean.java similarity index 100% rename from jonas/jonas/examples/jaasclient/src/jaasclient/beans/secusb/JAASOpBean.java rename to jonas/examples/jaasclient/src/jaasclient/beans/secusb/JAASOpBean.java diff --git a/jonas/jonas/examples/jaasclient/src/jaasclient/beans/secusb/JAASOpHome.java b/jonas/examples/jaasclient/src/jaasclient/beans/secusb/JAASOpHome.java similarity index 100% rename from jonas/jonas/examples/jaasclient/src/jaasclient/beans/secusb/JAASOpHome.java rename to jonas/examples/jaasclient/src/jaasclient/beans/secusb/JAASOpHome.java diff --git a/jonas/jonas/examples/jdo/Bank_src.zip b/jonas/examples/jdo/Bank_src.zip similarity index 100% rename from jonas/jonas/examples/jdo/Bank_src.zip rename to jonas/examples/jdo/Bank_src.zip diff --git a/jonas/jonas/examples/jdo/README b/jonas/examples/jdo/README similarity index 100% rename from jonas/jonas/examples/jdo/README rename to jonas/examples/jdo/README diff --git a/jonas/jonas/examples/jdo/build.xml b/jonas/examples/jdo/build.xml similarity index 100% rename from jonas/jonas/examples/jdo/build.xml rename to jonas/examples/jdo/build.xml diff --git a/jonas/jonas/examples/olstore/build-original.xml b/jonas/examples/olstore/build-original.xml similarity index 100% rename from jonas/jonas/examples/olstore/build-original.xml rename to jonas/examples/olstore/build-original.xml diff --git a/jonas/jonas/examples/olstore/build-spring.xml b/jonas/examples/olstore/build-spring.xml similarity index 100% rename from jonas/jonas/examples/olstore/build-spring.xml rename to jonas/examples/olstore/build-spring.xml diff --git a/jonas/jonas/examples/olstore/build-springmvc.xml b/jonas/examples/olstore/build-springmvc.xml similarity index 100% rename from jonas/jonas/examples/olstore/build-springmvc.xml rename to jonas/examples/olstore/build-springmvc.xml diff --git a/jonas/jonas/examples/olstore/build.properties b/jonas/examples/olstore/build.properties similarity index 100% rename from jonas/jonas/examples/olstore/build.properties rename to jonas/examples/olstore/build.properties diff --git a/jonas/jonas/examples/olstore/build.xml b/jonas/examples/olstore/build.xml similarity index 100% rename from jonas/jonas/examples/olstore/build.xml rename to jonas/examples/olstore/build.xml diff --git a/jonas/jonas/examples/olstore/client/README b/jonas/examples/olstore/client/README similarity index 100% rename from jonas/jonas/examples/olstore/client/README rename to jonas/examples/olstore/client/README diff --git a/jonas/jonas/examples/olstore/client/build.xml b/jonas/examples/olstore/client/build.xml similarity index 100% rename from jonas/jonas/examples/olstore/client/build.xml rename to jonas/examples/olstore/client/build.xml diff --git a/jonas/jonas/examples/olstore/client/images/olstoreLogo.png b/jonas/examples/olstore/client/images/olstoreLogo.png similarity index 100% rename from jonas/jonas/examples/olstore/client/images/olstoreLogo.png rename to jonas/examples/olstore/client/images/olstoreLogo.png diff --git a/jonas/jonas/examples/olstore/client/src/olstore/client/Configure.java b/jonas/examples/olstore/client/src/olstore/client/Configure.java similarity index 100% rename from jonas/jonas/examples/olstore/client/src/olstore/client/Configure.java rename to jonas/examples/olstore/client/src/olstore/client/Configure.java diff --git a/jonas/jonas/examples/olstore/client/src/olstore/client/Item.java b/jonas/examples/olstore/client/src/olstore/client/Item.java similarity index 100% rename from jonas/jonas/examples/olstore/client/src/olstore/client/Item.java rename to jonas/examples/olstore/client/src/olstore/client/Item.java diff --git a/jonas/jonas/examples/olstore/client/src/olstore/client/ItemPanel.java b/jonas/examples/olstore/client/src/olstore/client/ItemPanel.java similarity index 100% rename from jonas/jonas/examples/olstore/client/src/olstore/client/ItemPanel.java rename to jonas/examples/olstore/client/src/olstore/client/ItemPanel.java diff --git a/jonas/jonas/examples/olstore/client/src/olstore/client/ItemPanelTransferHandler.java b/jonas/examples/olstore/client/src/olstore/client/ItemPanelTransferHandler.java similarity index 100% rename from jonas/jonas/examples/olstore/client/src/olstore/client/ItemPanelTransferHandler.java rename to jonas/examples/olstore/client/src/olstore/client/ItemPanelTransferHandler.java diff --git a/jonas/jonas/examples/olstore/client/src/olstore/client/LoginDialog.java b/jonas/examples/olstore/client/src/olstore/client/LoginDialog.java similarity index 100% rename from jonas/jonas/examples/olstore/client/src/olstore/client/LoginDialog.java rename to jonas/examples/olstore/client/src/olstore/client/LoginDialog.java diff --git a/jonas/jonas/examples/olstore/client/src/olstore/client/OlstoreSwingClient.java b/jonas/examples/olstore/client/src/olstore/client/OlstoreSwingClient.java similarity index 100% rename from jonas/jonas/examples/olstore/client/src/olstore/client/OlstoreSwingClient.java rename to jonas/examples/olstore/client/src/olstore/client/OlstoreSwingClient.java diff --git a/jonas/jonas/examples/olstore/client/src/olstore/client/OrderItem.java b/jonas/examples/olstore/client/src/olstore/client/OrderItem.java similarity index 100% rename from jonas/jonas/examples/olstore/client/src/olstore/client/OrderItem.java rename to jonas/examples/olstore/client/src/olstore/client/OrderItem.java diff --git a/jonas/jonas/examples/olstore/client/src/olstore/client/OrderPanel.java b/jonas/examples/olstore/client/src/olstore/client/OrderPanel.java similarity index 100% rename from jonas/jonas/examples/olstore/client/src/olstore/client/OrderPanel.java rename to jonas/examples/olstore/client/src/olstore/client/OrderPanel.java diff --git a/jonas/jonas/examples/olstore/client/src/olstore/client/RegistryConnector.java b/jonas/examples/olstore/client/src/olstore/client/RegistryConnector.java similarity index 100% rename from jonas/jonas/examples/olstore/client/src/olstore/client/RegistryConnector.java rename to jonas/examples/olstore/client/src/olstore/client/RegistryConnector.java diff --git a/jonas/jonas/examples/olstore/client/src/olstore/client/ShoppingCartPanel.java b/jonas/examples/olstore/client/src/olstore/client/ShoppingCartPanel.java similarity index 100% rename from jonas/jonas/examples/olstore/client/src/olstore/client/ShoppingCartPanel.java rename to jonas/examples/olstore/client/src/olstore/client/ShoppingCartPanel.java diff --git a/jonas/jonas/examples/olstore/client/uddi.properties b/jonas/examples/olstore/client/uddi.properties similarity index 100% rename from jonas/jonas/examples/olstore/client/uddi.properties rename to jonas/examples/olstore/client/uddi.properties diff --git a/jonas/jonas/examples/olstore/doc/readme.html b/jonas/examples/olstore/doc/readme.html similarity index 100% rename from jonas/jonas/examples/olstore/doc/readme.html rename to jonas/examples/olstore/doc/readme.html diff --git a/jonas/jonas/examples/olstore/olstore/ChangeLog b/jonas/examples/olstore/olstore/ChangeLog similarity index 100% rename from jonas/jonas/examples/olstore/olstore/ChangeLog rename to jonas/examples/olstore/olstore/ChangeLog diff --git a/jonas/jonas/examples/olstore/olstore/META-INF/application.xml b/jonas/examples/olstore/olstore/META-INF/application.xml similarity index 100% rename from jonas/jonas/examples/olstore/olstore/META-INF/application.xml rename to jonas/examples/olstore/olstore/META-INF/application.xml diff --git a/jonas/jonas/examples/olstore/olstoreejb/ChangeLog b/jonas/examples/olstore/olstoreejb/ChangeLog similarity index 100% rename from jonas/jonas/examples/olstore/olstoreejb/ChangeLog rename to jonas/examples/olstore/olstoreejb/ChangeLog diff --git a/jonas/jonas/examples/olstore/olstoreejb/META-INF/build.properties b/jonas/examples/olstore/olstoreejb/META-INF/build.properties similarity index 100% rename from jonas/jonas/examples/olstore/olstoreejb/META-INF/build.properties rename to jonas/examples/olstore/olstoreejb/META-INF/build.properties diff --git a/jonas/jonas/examples/olstore/olstoreejb/META-INF/build.xml b/jonas/examples/olstore/olstoreejb/META-INF/build.xml similarity index 100% rename from jonas/jonas/examples/olstore/olstoreejb/META-INF/build.xml rename to jonas/examples/olstore/olstoreejb/META-INF/build.xml diff --git a/jonas/jonas/examples/olstore/olstoreejb/META-INF/jonas-session.xml b/jonas/examples/olstore/olstoreejb/META-INF/jonas-session.xml similarity index 100% rename from jonas/jonas/examples/olstore/olstoreejb/META-INF/jonas-session.xml rename to jonas/examples/olstore/olstoreejb/META-INF/jonas-session.xml diff --git a/jonas/jonas/examples/olstore/olstoreejb/META-INF/jonas-webservices.xml b/jonas/examples/olstore/olstoreejb/META-INF/jonas-webservices.xml similarity index 100% rename from jonas/jonas/examples/olstore/olstoreejb/META-INF/jonas-webservices.xml rename to jonas/examples/olstore/olstoreejb/META-INF/jonas-webservices.xml diff --git a/jonas/jonas/examples/olstore/olstoreejb/META-INF/olstoreEndpointMapping.xml b/jonas/examples/olstore/olstoreejb/META-INF/olstoreEndpointMapping.xml similarity index 100% rename from jonas/jonas/examples/olstore/olstoreejb/META-INF/olstoreEndpointMapping.xml rename to jonas/examples/olstore/olstoreejb/META-INF/olstoreEndpointMapping.xml diff --git a/jonas/jonas/examples/olstore/olstoreejb/META-INF/olstorews-ejbjar.xml b/jonas/examples/olstore/olstoreejb/META-INF/olstorews-ejbjar.xml similarity index 100% rename from jonas/jonas/examples/olstore/olstoreejb/META-INF/olstorews-ejbjar.xml rename to jonas/examples/olstore/olstoreejb/META-INF/olstorews-ejbjar.xml diff --git a/jonas/jonas/examples/olstore/olstoreejb/META-INF/session-beans.xml b/jonas/examples/olstore/olstoreejb/META-INF/session-beans.xml similarity index 100% rename from jonas/jonas/examples/olstore/olstoreejb/META-INF/session-beans.xml rename to jonas/examples/olstore/olstoreejb/META-INF/session-beans.xml diff --git a/jonas/jonas/examples/olstore/olstoreejb/META-INF/targets.xml b/jonas/examples/olstore/olstoreejb/META-INF/targets.xml similarity index 100% rename from jonas/jonas/examples/olstore/olstoreejb/META-INF/targets.xml rename to jonas/examples/olstore/olstoreejb/META-INF/targets.xml diff --git a/jonas/jonas/examples/olstore/olstoreejb/META-INF/webservices.xml b/jonas/examples/olstore/olstoreejb/META-INF/webservices.xml similarity index 100% rename from jonas/jonas/examples/olstore/olstoreejb/META-INF/webservices.xml rename to jonas/examples/olstore/olstoreejb/META-INF/webservices.xml diff --git a/jonas/jonas/examples/olstore/olstoreejb/META-INF/wsShoppingCartMapping.xml b/jonas/examples/olstore/olstoreejb/META-INF/wsShoppingCartMapping.xml similarity index 100% rename from jonas/jonas/examples/olstore/olstoreejb/META-INF/wsShoppingCartMapping.xml rename to jonas/examples/olstore/olstoreejb/META-INF/wsShoppingCartMapping.xml diff --git a/jonas/jonas/examples/olstore/olstoreejb/META-INF/xdoclet.xml b/jonas/examples/olstore/olstoreejb/META-INF/xdoclet.xml similarity index 100% rename from jonas/jonas/examples/olstore/olstoreejb/META-INF/xdoclet.xml rename to jonas/examples/olstore/olstoreejb/META-INF/xdoclet.xml diff --git a/jonas/jonas/examples/olstore/olstoreweb/ChangeLog b/jonas/examples/olstore/olstoreweb/ChangeLog similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/ChangeLog rename to jonas/examples/olstore/olstoreweb/ChangeLog diff --git a/jonas/jonas/examples/olstore/olstoreweb/META-INF/context.xml b/jonas/examples/olstore/olstoreweb/META-INF/context.xml similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/META-INF/context.xml rename to jonas/examples/olstore/olstoreweb/META-INF/context.xml diff --git a/jonas/jonas/examples/olstore/olstoreweb/WEB-INF/ApplicationResources.properties b/jonas/examples/olstore/olstoreweb/WEB-INF/ApplicationResources.properties similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/WEB-INF/ApplicationResources.properties rename to jonas/examples/olstore/olstoreweb/WEB-INF/ApplicationResources.properties diff --git a/jonas/jonas/examples/olstore/olstoreweb/WEB-INF/jonas-web.xml b/jonas/examples/olstore/olstoreweb/WEB-INF/jonas-web.xml similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/WEB-INF/jonas-web.xml rename to jonas/examples/olstore/olstoreweb/WEB-INF/jonas-web.xml diff --git a/jonas/jonas/examples/olstore/olstoreweb/WEB-INF/olstoreUDDI.properties b/jonas/examples/olstore/olstoreweb/WEB-INF/olstoreUDDI.properties similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/WEB-INF/olstoreUDDI.properties rename to jonas/examples/olstore/olstoreweb/WEB-INF/olstoreUDDI.properties diff --git a/jonas/jonas/examples/olstore/olstoreweb/WEB-INF/spring/applicationContext.xml b/jonas/examples/olstore/olstoreweb/WEB-INF/spring/applicationContext.xml similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/WEB-INF/spring/applicationContext.xml rename to jonas/examples/olstore/olstoreweb/WEB-INF/spring/applicationContext.xml diff --git a/jonas/jonas/examples/olstore/olstoreweb/WEB-INF/springmvc/applicationContext.xml b/jonas/examples/olstore/olstoreweb/WEB-INF/springmvc/applicationContext.xml similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/WEB-INF/springmvc/applicationContext.xml rename to jonas/examples/olstore/olstoreweb/WEB-INF/springmvc/applicationContext.xml diff --git a/jonas/jonas/examples/olstore/olstoreweb/WEB-INF/springmvc/olstore-servlet.xml b/jonas/examples/olstore/olstoreweb/WEB-INF/springmvc/olstore-servlet.xml similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/WEB-INF/springmvc/olstore-servlet.xml rename to jonas/examples/olstore/olstoreweb/WEB-INF/springmvc/olstore-servlet.xml diff --git a/jonas/jonas/examples/olstore/olstoreweb/WEB-INF/struts-config.xml b/jonas/examples/olstore/olstoreweb/WEB-INF/struts-config.xml similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/WEB-INF/struts-config.xml rename to jonas/examples/olstore/olstoreweb/WEB-INF/struts-config.xml diff --git a/jonas/jonas/examples/olstore/olstoreweb/WEB-INF/tld/struts-bean.tld b/jonas/examples/olstore/olstoreweb/WEB-INF/tld/struts-bean.tld similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/WEB-INF/tld/struts-bean.tld rename to jonas/examples/olstore/olstoreweb/WEB-INF/tld/struts-bean.tld diff --git a/jonas/jonas/examples/olstore/olstoreweb/WEB-INF/tld/struts-html.tld b/jonas/examples/olstore/olstoreweb/WEB-INF/tld/struts-html.tld similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/WEB-INF/tld/struts-html.tld rename to jonas/examples/olstore/olstoreweb/WEB-INF/tld/struts-html.tld diff --git a/jonas/jonas/examples/olstore/olstoreweb/WEB-INF/tld/struts-logic.tld b/jonas/examples/olstore/olstoreweb/WEB-INF/tld/struts-logic.tld similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/WEB-INF/tld/struts-logic.tld rename to jonas/examples/olstore/olstoreweb/WEB-INF/tld/struts-logic.tld diff --git a/jonas/jonas/examples/olstore/olstoreweb/WEB-INF/tld/struts-nested.tld b/jonas/examples/olstore/olstoreweb/WEB-INF/tld/struts-nested.tld similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/WEB-INF/tld/struts-nested.tld rename to jonas/examples/olstore/olstoreweb/WEB-INF/tld/struts-nested.tld diff --git a/jonas/jonas/examples/olstore/olstoreweb/WEB-INF/tld/struts-template.tld b/jonas/examples/olstore/olstoreweb/WEB-INF/tld/struts-template.tld similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/WEB-INF/tld/struts-template.tld rename to jonas/examples/olstore/olstoreweb/WEB-INF/tld/struts-template.tld diff --git a/jonas/jonas/examples/olstore/olstoreweb/WEB-INF/tld/struts-tiles.tld b/jonas/examples/olstore/olstoreweb/WEB-INF/tld/struts-tiles.tld similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/WEB-INF/tld/struts-tiles.tld rename to jonas/examples/olstore/olstoreweb/WEB-INF/tld/struts-tiles.tld diff --git a/jonas/jonas/examples/olstore/olstoreweb/WEB-INF/validation.xml b/jonas/examples/olstore/olstoreweb/WEB-INF/validation.xml similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/WEB-INF/validation.xml rename to jonas/examples/olstore/olstoreweb/WEB-INF/validation.xml diff --git a/jonas/jonas/examples/olstore/olstoreweb/WEB-INF/validator-rules.xml b/jonas/examples/olstore/olstoreweb/WEB-INF/validator-rules.xml similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/WEB-INF/validator-rules.xml rename to jonas/examples/olstore/olstoreweb/WEB-INF/validator-rules.xml diff --git a/jonas/jonas/examples/olstore/olstoreweb/WEB-INF/web-jetty.xml b/jonas/examples/olstore/olstoreweb/WEB-INF/web-jetty.xml similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/WEB-INF/web-jetty.xml rename to jonas/examples/olstore/olstoreweb/WEB-INF/web-jetty.xml diff --git a/jonas/jonas/examples/olstore/olstoreweb/WEB-INF/web-original.xml b/jonas/examples/olstore/olstoreweb/WEB-INF/web-original.xml similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/WEB-INF/web-original.xml rename to jonas/examples/olstore/olstoreweb/WEB-INF/web-original.xml diff --git a/jonas/jonas/examples/olstore/olstoreweb/WEB-INF/web-spring.xml b/jonas/examples/olstore/olstoreweb/WEB-INF/web-spring.xml similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/WEB-INF/web-spring.xml rename to jonas/examples/olstore/olstoreweb/WEB-INF/web-spring.xml diff --git a/jonas/jonas/examples/olstore/olstoreweb/WEB-INF/web-springmvc.xml b/jonas/examples/olstore/olstoreweb/WEB-INF/web-springmvc.xml similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/WEB-INF/web-springmvc.xml rename to jonas/examples/olstore/olstoreweb/WEB-INF/web-springmvc.xml diff --git a/jonas/jonas/examples/olstore/olstoreweb/WEB-INF/web-struts.xml b/jonas/examples/olstore/olstoreweb/WEB-INF/web-struts.xml similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/WEB-INF/web-struts.xml rename to jonas/examples/olstore/olstoreweb/WEB-INF/web-struts.xml diff --git a/jonas/jonas/examples/olstore/olstoreweb/WEB-INF/web.xml b/jonas/examples/olstore/olstoreweb/WEB-INF/web.xml similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/WEB-INF/web.xml rename to jonas/examples/olstore/olstoreweb/WEB-INF/web.xml diff --git a/jonas/jonas/examples/olstore/olstoreweb/admin/createItem.jsp b/jonas/examples/olstore/olstoreweb/admin/createItem.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/admin/createItem.jsp rename to jonas/examples/olstore/olstoreweb/admin/createItem.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/admin/createPropForm.jsp b/jonas/examples/olstore/olstoreweb/admin/createPropForm.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/admin/createPropForm.jsp rename to jonas/examples/olstore/olstoreweb/admin/createPropForm.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/admin/createType.jsp b/jonas/examples/olstore/olstoreweb/admin/createType.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/admin/createType.jsp rename to jonas/examples/olstore/olstoreweb/admin/createType.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/admin/editstatus.jsp b/jonas/examples/olstore/olstoreweb/admin/editstatus.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/admin/editstatus.jsp rename to jonas/examples/olstore/olstoreweb/admin/editstatus.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/checkout/checkout.jsp b/jonas/examples/olstore/olstoreweb/checkout/checkout.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/checkout/checkout.jsp rename to jonas/examples/olstore/olstoreweb/checkout/checkout.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/create/ModUser.jsp b/jonas/examples/olstore/olstoreweb/create/ModUser.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/create/ModUser.jsp rename to jonas/examples/olstore/olstoreweb/create/ModUser.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/create/moduser.js b/jonas/examples/olstore/olstoreweb/create/moduser.js similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/create/moduser.js rename to jonas/examples/olstore/olstoreweb/create/moduser.js diff --git a/jonas/jonas/examples/olstore/olstoreweb/css/site.css b/jonas/examples/olstore/olstoreweb/css/site.css similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/css/site.css rename to jonas/examples/olstore/olstoreweb/css/site.css diff --git a/jonas/jonas/examples/olstore/olstoreweb/error.jsp b/jonas/examples/olstore/olstoreweb/error.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/error.jsp rename to jonas/examples/olstore/olstoreweb/error.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/general/CreateUser.jsp b/jonas/examples/olstore/olstoreweb/general/CreateUser.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/general/CreateUser.jsp rename to jonas/examples/olstore/olstoreweb/general/CreateUser.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/general/Messages.jsp b/jonas/examples/olstore/olstoreweb/general/Messages.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/general/Messages.jsp rename to jonas/examples/olstore/olstoreweb/general/Messages.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/general/UserCreateConfirm.jsp b/jonas/examples/olstore/olstoreweb/general/UserCreateConfirm.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/general/UserCreateConfirm.jsp rename to jonas/examples/olstore/olstoreweb/general/UserCreateConfirm.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/general/UserForm.jsp b/jonas/examples/olstore/olstoreweb/general/UserForm.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/general/UserForm.jsp rename to jonas/examples/olstore/olstoreweb/general/UserForm.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/general/help.jsp b/jonas/examples/olstore/olstoreweb/general/help.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/general/help.jsp rename to jonas/examples/olstore/olstoreweb/general/help.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/general/logo.png b/jonas/examples/olstore/olstoreweb/general/logo.png similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/general/logo.png rename to jonas/examples/olstore/olstoreweb/general/logo.png diff --git a/jonas/jonas/examples/olstore/olstoreweb/general/olstoreLogo.png b/jonas/examples/olstore/olstoreweb/general/olstoreLogo.png similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/general/olstoreLogo.png rename to jonas/examples/olstore/olstoreweb/general/olstoreLogo.png diff --git a/jonas/jonas/examples/olstore/olstoreweb/images/CRT1.jpg b/jonas/examples/olstore/olstoreweb/images/CRT1.jpg similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/images/CRT1.jpg rename to jonas/examples/olstore/olstoreweb/images/CRT1.jpg diff --git a/jonas/jonas/examples/olstore/olstoreweb/images/CRT2.jpg b/jonas/examples/olstore/olstoreweb/images/CRT2.jpg similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/images/CRT2.jpg rename to jonas/examples/olstore/olstoreweb/images/CRT2.jpg diff --git a/jonas/jonas/examples/olstore/olstoreweb/images/CRT3.jpg b/jonas/examples/olstore/olstoreweb/images/CRT3.jpg similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/images/CRT3.jpg rename to jonas/examples/olstore/olstoreweb/images/CRT3.jpg diff --git a/jonas/jonas/examples/olstore/olstoreweb/images/LCD1.jpg b/jonas/examples/olstore/olstoreweb/images/LCD1.jpg similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/images/LCD1.jpg rename to jonas/examples/olstore/olstoreweb/images/LCD1.jpg diff --git a/jonas/jonas/examples/olstore/olstoreweb/images/LCD2.jpg b/jonas/examples/olstore/olstoreweb/images/LCD2.jpg similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/images/LCD2.jpg rename to jonas/examples/olstore/olstoreweb/images/LCD2.jpg diff --git a/jonas/jonas/examples/olstore/olstoreweb/images/LCD3.jpg b/jonas/examples/olstore/olstoreweb/images/LCD3.jpg similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/images/LCD3.jpg rename to jonas/examples/olstore/olstoreweb/images/LCD3.jpg diff --git a/jonas/jonas/examples/olstore/olstoreweb/images/LCD4.jpg b/jonas/examples/olstore/olstoreweb/images/LCD4.jpg similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/images/LCD4.jpg rename to jonas/examples/olstore/olstoreweb/images/LCD4.jpg diff --git a/jonas/jonas/examples/olstore/olstoreweb/images/LCD5.jpg b/jonas/examples/olstore/olstoreweb/images/LCD5.jpg similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/images/LCD5.jpg rename to jonas/examples/olstore/olstoreweb/images/LCD5.jpg diff --git a/jonas/jonas/examples/olstore/olstoreweb/images/LCD6.jpg b/jonas/examples/olstore/olstoreweb/images/LCD6.jpg similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/images/LCD6.jpg rename to jonas/examples/olstore/olstoreweb/images/LCD6.jpg diff --git a/jonas/jonas/examples/olstore/olstoreweb/images/LCD7.jpg b/jonas/examples/olstore/olstoreweb/images/LCD7.jpg similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/images/LCD7.jpg rename to jonas/examples/olstore/olstoreweb/images/LCD7.jpg diff --git a/jonas/jonas/examples/olstore/olstoreweb/images/LCD8.jpg b/jonas/examples/olstore/olstoreweb/images/LCD8.jpg similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/images/LCD8.jpg rename to jonas/examples/olstore/olstoreweb/images/LCD8.jpg diff --git a/jonas/jonas/examples/olstore/olstoreweb/images/cd10.jpg b/jonas/examples/olstore/olstoreweb/images/cd10.jpg similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/images/cd10.jpg rename to jonas/examples/olstore/olstoreweb/images/cd10.jpg diff --git a/jonas/jonas/examples/olstore/olstoreweb/images/cd11.jpg b/jonas/examples/olstore/olstoreweb/images/cd11.jpg similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/images/cd11.jpg rename to jonas/examples/olstore/olstoreweb/images/cd11.jpg diff --git a/jonas/jonas/examples/olstore/olstoreweb/images/cd12.jpg b/jonas/examples/olstore/olstoreweb/images/cd12.jpg similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/images/cd12.jpg rename to jonas/examples/olstore/olstoreweb/images/cd12.jpg diff --git a/jonas/jonas/examples/olstore/olstoreweb/images/cd13.jpg b/jonas/examples/olstore/olstoreweb/images/cd13.jpg similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/images/cd13.jpg rename to jonas/examples/olstore/olstoreweb/images/cd13.jpg diff --git a/jonas/jonas/examples/olstore/olstoreweb/images/cd14.jpg b/jonas/examples/olstore/olstoreweb/images/cd14.jpg similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/images/cd14.jpg rename to jonas/examples/olstore/olstoreweb/images/cd14.jpg diff --git a/jonas/jonas/examples/olstore/olstoreweb/images/cd15.jpg b/jonas/examples/olstore/olstoreweb/images/cd15.jpg similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/images/cd15.jpg rename to jonas/examples/olstore/olstoreweb/images/cd15.jpg diff --git a/jonas/jonas/examples/olstore/olstoreweb/images/cd16.jpg b/jonas/examples/olstore/olstoreweb/images/cd16.jpg similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/images/cd16.jpg rename to jonas/examples/olstore/olstoreweb/images/cd16.jpg diff --git a/jonas/jonas/examples/olstore/olstoreweb/images/cd17.jpg b/jonas/examples/olstore/olstoreweb/images/cd17.jpg similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/images/cd17.jpg rename to jonas/examples/olstore/olstoreweb/images/cd17.jpg diff --git a/jonas/jonas/examples/olstore/olstoreweb/images/cd18.jpg b/jonas/examples/olstore/olstoreweb/images/cd18.jpg similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/images/cd18.jpg rename to jonas/examples/olstore/olstoreweb/images/cd18.jpg diff --git a/jonas/jonas/examples/olstore/olstoreweb/images/cd19.jpg b/jonas/examples/olstore/olstoreweb/images/cd19.jpg similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/images/cd19.jpg rename to jonas/examples/olstore/olstoreweb/images/cd19.jpg diff --git a/jonas/jonas/examples/olstore/olstoreweb/images/cd2.jpg b/jonas/examples/olstore/olstoreweb/images/cd2.jpg similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/images/cd2.jpg rename to jonas/examples/olstore/olstoreweb/images/cd2.jpg diff --git a/jonas/jonas/examples/olstore/olstoreweb/images/cd20.jpg b/jonas/examples/olstore/olstoreweb/images/cd20.jpg similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/images/cd20.jpg rename to jonas/examples/olstore/olstoreweb/images/cd20.jpg diff --git a/jonas/jonas/examples/olstore/olstoreweb/images/cd21.jpg b/jonas/examples/olstore/olstoreweb/images/cd21.jpg similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/images/cd21.jpg rename to jonas/examples/olstore/olstoreweb/images/cd21.jpg diff --git a/jonas/jonas/examples/olstore/olstoreweb/images/cd3.jpg b/jonas/examples/olstore/olstoreweb/images/cd3.jpg similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/images/cd3.jpg rename to jonas/examples/olstore/olstoreweb/images/cd3.jpg diff --git a/jonas/jonas/examples/olstore/olstoreweb/images/cd4.jpg b/jonas/examples/olstore/olstoreweb/images/cd4.jpg similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/images/cd4.jpg rename to jonas/examples/olstore/olstoreweb/images/cd4.jpg diff --git a/jonas/jonas/examples/olstore/olstoreweb/images/cd5.jpg b/jonas/examples/olstore/olstoreweb/images/cd5.jpg similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/images/cd5.jpg rename to jonas/examples/olstore/olstoreweb/images/cd5.jpg diff --git a/jonas/jonas/examples/olstore/olstoreweb/images/cd6.jpg b/jonas/examples/olstore/olstoreweb/images/cd6.jpg similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/images/cd6.jpg rename to jonas/examples/olstore/olstoreweb/images/cd6.jpg diff --git a/jonas/jonas/examples/olstore/olstoreweb/images/cd7.jpg b/jonas/examples/olstore/olstoreweb/images/cd7.jpg similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/images/cd7.jpg rename to jonas/examples/olstore/olstoreweb/images/cd7.jpg diff --git a/jonas/jonas/examples/olstore/olstoreweb/images/cd8.jpg b/jonas/examples/olstore/olstoreweb/images/cd8.jpg similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/images/cd8.jpg rename to jonas/examples/olstore/olstoreweb/images/cd8.jpg diff --git a/jonas/jonas/examples/olstore/olstoreweb/images/cd9.jpg b/jonas/examples/olstore/olstoreweb/images/cd9.jpg similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/images/cd9.jpg rename to jonas/examples/olstore/olstoreweb/images/cd9.jpg diff --git a/jonas/jonas/examples/olstore/olstoreweb/images/computer_upfront.jpg b/jonas/examples/olstore/olstoreweb/images/computer_upfront.jpg similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/images/computer_upfront.jpg rename to jonas/examples/olstore/olstoreweb/images/computer_upfront.jpg diff --git a/jonas/jonas/examples/olstore/olstoreweb/images/laptop.jpg b/jonas/examples/olstore/olstoreweb/images/laptop.jpg similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/images/laptop.jpg rename to jonas/examples/olstore/olstoreweb/images/laptop.jpg diff --git a/jonas/jonas/examples/olstore/olstoreweb/images/laptop_angled.jpg b/jonas/examples/olstore/olstoreweb/images/laptop_angled.jpg similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/images/laptop_angled.jpg rename to jonas/examples/olstore/olstoreweb/images/laptop_angled.jpg diff --git a/jonas/jonas/examples/olstore/olstoreweb/images/laptop_front.jpg b/jonas/examples/olstore/olstoreweb/images/laptop_front.jpg similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/images/laptop_front.jpg rename to jonas/examples/olstore/olstoreweb/images/laptop_front.jpg diff --git a/jonas/jonas/examples/olstore/olstoreweb/images/laptop_power_view.jpg b/jonas/examples/olstore/olstoreweb/images/laptop_power_view.jpg similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/images/laptop_power_view.jpg rename to jonas/examples/olstore/olstoreweb/images/laptop_power_view.jpg diff --git a/jonas/jonas/examples/olstore/olstoreweb/images/laptop_side.jpg b/jonas/examples/olstore/olstoreweb/images/laptop_side.jpg similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/images/laptop_side.jpg rename to jonas/examples/olstore/olstoreweb/images/laptop_side.jpg diff --git a/jonas/jonas/examples/olstore/olstoreweb/images/lonely_laptop.jpg b/jonas/examples/olstore/olstoreweb/images/lonely_laptop.jpg similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/images/lonely_laptop.jpg rename to jonas/examples/olstore/olstoreweb/images/lonely_laptop.jpg diff --git a/jonas/jonas/examples/olstore/olstoreweb/images/olstoreLogo.png b/jonas/examples/olstore/olstoreweb/images/olstoreLogo.png similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/images/olstoreLogo.png rename to jonas/examples/olstore/olstoreweb/images/olstoreLogo.png diff --git a/jonas/jonas/examples/olstore/olstoreweb/images/tabletop_laptop.jpg b/jonas/examples/olstore/olstoreweb/images/tabletop_laptop.jpg similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/images/tabletop_laptop.jpg rename to jonas/examples/olstore/olstoreweb/images/tabletop_laptop.jpg diff --git a/jonas/jonas/examples/olstore/olstoreweb/images/white_laptop.jpg b/jonas/examples/olstore/olstoreweb/images/white_laptop.jpg similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/images/white_laptop.jpg rename to jonas/examples/olstore/olstoreweb/images/white_laptop.jpg diff --git a/jonas/jonas/examples/olstore/olstoreweb/index.jsp b/jonas/examples/olstore/olstoreweb/index.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/index.jsp rename to jonas/examples/olstore/olstoreweb/index.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/login/addsession.jsp b/jonas/examples/olstore/olstoreweb/login/addsession.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/login/addsession.jsp rename to jonas/examples/olstore/olstoreweb/login/addsession.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/login/error.jsp b/jonas/examples/olstore/olstoreweb/login/error.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/login/error.jsp rename to jonas/examples/olstore/olstoreweb/login/error.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/login/error403.jsp b/jonas/examples/olstore/olstoreweb/login/error403.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/login/error403.jsp rename to jonas/examples/olstore/olstoreweb/login/error403.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/login/error404.jsp b/jonas/examples/olstore/olstoreweb/login/error404.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/login/error404.jsp rename to jonas/examples/olstore/olstoreweb/login/error404.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/login/login.jsp b/jonas/examples/olstore/olstoreweb/login/login.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/login/login.jsp rename to jonas/examples/olstore/olstoreweb/login/login.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/login/logout.jsp b/jonas/examples/olstore/olstoreweb/login/logout.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/login/logout.jsp rename to jonas/examples/olstore/olstoreweb/login/logout.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/nav/Footer.jsp b/jonas/examples/olstore/olstoreweb/nav/Footer.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/nav/Footer.jsp rename to jonas/examples/olstore/olstoreweb/nav/Footer.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/nav/Header.jsp b/jonas/examples/olstore/olstoreweb/nav/Header.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/nav/Header.jsp rename to jonas/examples/olstore/olstoreweb/nav/Header.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/nav/Left.jsp b/jonas/examples/olstore/olstoreweb/nav/Left.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/nav/Left.jsp rename to jonas/examples/olstore/olstoreweb/nav/Left.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/nav/loginHeader.jsp b/jonas/examples/olstore/olstoreweb/nav/loginHeader.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/nav/loginHeader.jsp rename to jonas/examples/olstore/olstoreweb/nav/loginHeader.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/populate/ComputersPopulate.jsp b/jonas/examples/olstore/olstoreweb/populate/ComputersPopulate.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/populate/ComputersPopulate.jsp rename to jonas/examples/olstore/olstoreweb/populate/ComputersPopulate.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/populate/FriendsPopulate.jsp b/jonas/examples/olstore/olstoreweb/populate/FriendsPopulate.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/populate/FriendsPopulate.jsp rename to jonas/examples/olstore/olstoreweb/populate/FriendsPopulate.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/populate/ItemPopulate.jsp b/jonas/examples/olstore/olstoreweb/populate/ItemPopulate.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/populate/ItemPopulate.jsp rename to jonas/examples/olstore/olstoreweb/populate/ItemPopulate.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/populate/MonitorPopulate.jsp b/jonas/examples/olstore/olstoreweb/populate/MonitorPopulate.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/populate/MonitorPopulate.jsp rename to jonas/examples/olstore/olstoreweb/populate/MonitorPopulate.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/populate/OrderPopulate.jsp b/jonas/examples/olstore/olstoreweb/populate/OrderPopulate.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/populate/OrderPopulate.jsp rename to jonas/examples/olstore/olstoreweb/populate/OrderPopulate.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/populate/Populate.jsp b/jonas/examples/olstore/olstoreweb/populate/Populate.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/populate/Populate.jsp rename to jonas/examples/olstore/olstoreweb/populate/Populate.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/populate/PopulateOrders.jsp b/jonas/examples/olstore/olstoreweb/populate/PopulateOrders.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/populate/PopulateOrders.jsp rename to jonas/examples/olstore/olstoreweb/populate/PopulateOrders.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/populate/RegistryPopulate.jsp b/jonas/examples/olstore/olstoreweb/populate/RegistryPopulate.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/populate/RegistryPopulate.jsp rename to jonas/examples/olstore/olstoreweb/populate/RegistryPopulate.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/populate/TypePopulate.jsp b/jonas/examples/olstore/olstoreweb/populate/TypePopulate.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/populate/TypePopulate.jsp rename to jonas/examples/olstore/olstoreweb/populate/TypePopulate.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/populate/UserPopulate.jsp b/jonas/examples/olstore/olstoreweb/populate/UserPopulate.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/populate/UserPopulate.jsp rename to jonas/examples/olstore/olstoreweb/populate/UserPopulate.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/populate/cdPopulate.jsp b/jonas/examples/olstore/olstoreweb/populate/cdPopulate.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/populate/cdPopulate.jsp rename to jonas/examples/olstore/olstoreweb/populate/cdPopulate.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/populate/populateNotice.jsp b/jonas/examples/olstore/olstoreweb/populate/populateNotice.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/populate/populateNotice.jsp rename to jonas/examples/olstore/olstoreweb/populate/populateNotice.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/spring/cart.jsp b/jonas/examples/olstore/olstoreweb/spring/cart.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/spring/cart.jsp rename to jonas/examples/olstore/olstoreweb/spring/cart.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/spring/common/footer.jsp b/jonas/examples/olstore/olstoreweb/spring/common/footer.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/spring/common/footer.jsp rename to jonas/examples/olstore/olstoreweb/spring/common/footer.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/spring/common/header.jsp b/jonas/examples/olstore/olstoreweb/spring/common/header.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/spring/common/header.jsp rename to jonas/examples/olstore/olstoreweb/spring/common/header.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/spring/common/left.jsp b/jonas/examples/olstore/olstoreweb/spring/common/left.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/spring/common/left.jsp rename to jonas/examples/olstore/olstoreweb/spring/common/left.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/spring/common/loginHeader.jsp b/jonas/examples/olstore/olstoreweb/spring/common/loginHeader.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/spring/common/loginHeader.jsp rename to jonas/examples/olstore/olstoreweb/spring/common/loginHeader.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/spring/common/userForm.jsp b/jonas/examples/olstore/olstoreweb/spring/common/userForm.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/spring/common/userForm.jsp rename to jonas/examples/olstore/olstoreweb/spring/common/userForm.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/spring/createItem.jsp b/jonas/examples/olstore/olstoreweb/spring/createItem.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/spring/createItem.jsp rename to jonas/examples/olstore/olstoreweb/spring/createItem.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/spring/createType.jsp b/jonas/examples/olstore/olstoreweb/spring/createType.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/spring/createType.jsp rename to jonas/examples/olstore/olstoreweb/spring/createType.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/spring/createUser.jsp b/jonas/examples/olstore/olstoreweb/spring/createUser.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/spring/createUser.jsp rename to jonas/examples/olstore/olstoreweb/spring/createUser.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/spring/editUser.jsp b/jonas/examples/olstore/olstoreweb/spring/editUser.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/spring/editUser.jsp rename to jonas/examples/olstore/olstoreweb/spring/editUser.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/spring/error/error403.jsp b/jonas/examples/olstore/olstoreweb/spring/error/error403.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/spring/error/error403.jsp rename to jonas/examples/olstore/olstoreweb/spring/error/error403.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/spring/error/error404.jsp b/jonas/examples/olstore/olstoreweb/spring/error/error404.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/spring/error/error404.jsp rename to jonas/examples/olstore/olstoreweb/spring/error/error404.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/spring/index.jsp b/jonas/examples/olstore/olstoreweb/spring/index.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/spring/index.jsp rename to jonas/examples/olstore/olstoreweb/spring/index.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/spring/listItems.jsp b/jonas/examples/olstore/olstoreweb/spring/listItems.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/spring/listItems.jsp rename to jonas/examples/olstore/olstoreweb/spring/listItems.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/spring/manageTypes.jsp b/jonas/examples/olstore/olstoreweb/spring/manageTypes.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/spring/manageTypes.jsp rename to jonas/examples/olstore/olstoreweb/spring/manageTypes.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/spring/messages.jsp b/jonas/examples/olstore/olstoreweb/spring/messages.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/spring/messages.jsp rename to jonas/examples/olstore/olstoreweb/spring/messages.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/spring/myItems.jsp b/jonas/examples/olstore/olstoreweb/spring/myItems.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/spring/myItems.jsp rename to jonas/examples/olstore/olstoreweb/spring/myItems.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/spring/populateNotice.jsp b/jonas/examples/olstore/olstoreweb/spring/populateNotice.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/spring/populateNotice.jsp rename to jonas/examples/olstore/olstoreweb/spring/populateNotice.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/spring/populateView.jsp b/jonas/examples/olstore/olstoreweb/spring/populateView.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/spring/populateView.jsp rename to jonas/examples/olstore/olstoreweb/spring/populateView.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/spring/signinView.jsp b/jonas/examples/olstore/olstoreweb/spring/signinView.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/spring/signinView.jsp rename to jonas/examples/olstore/olstoreweb/spring/signinView.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/spring/updateOrder.jsp b/jonas/examples/olstore/olstoreweb/spring/updateOrder.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/spring/updateOrder.jsp rename to jonas/examples/olstore/olstoreweb/spring/updateOrder.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/spring/viewItem.jsp b/jonas/examples/olstore/olstoreweb/spring/viewItem.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/spring/viewItem.jsp rename to jonas/examples/olstore/olstoreweb/spring/viewItem.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/spring/viewOrders.jsp b/jonas/examples/olstore/olstoreweb/spring/viewOrders.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/spring/viewOrders.jsp rename to jonas/examples/olstore/olstoreweb/spring/viewOrders.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/struts/admin/createItem.jsp b/jonas/examples/olstore/olstoreweb/struts/admin/createItem.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/struts/admin/createItem.jsp rename to jonas/examples/olstore/olstoreweb/struts/admin/createItem.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/struts/admin/createPropForm.jsp b/jonas/examples/olstore/olstoreweb/struts/admin/createPropForm.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/struts/admin/createPropForm.jsp rename to jonas/examples/olstore/olstoreweb/struts/admin/createPropForm.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/struts/admin/createType.jsp b/jonas/examples/olstore/olstoreweb/struts/admin/createType.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/struts/admin/createType.jsp rename to jonas/examples/olstore/olstoreweb/struts/admin/createType.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/struts/admin/editstatus.jsp b/jonas/examples/olstore/olstoreweb/struts/admin/editstatus.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/struts/admin/editstatus.jsp rename to jonas/examples/olstore/olstoreweb/struts/admin/editstatus.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/struts/checkout/checkout.jsp b/jonas/examples/olstore/olstoreweb/struts/checkout/checkout.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/struts/checkout/checkout.jsp rename to jonas/examples/olstore/olstoreweb/struts/checkout/checkout.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/struts/create/ModUser.jsp b/jonas/examples/olstore/olstoreweb/struts/create/ModUser.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/struts/create/ModUser.jsp rename to jonas/examples/olstore/olstoreweb/struts/create/ModUser.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/struts/create/moduser.js b/jonas/examples/olstore/olstoreweb/struts/create/moduser.js similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/struts/create/moduser.js rename to jonas/examples/olstore/olstoreweb/struts/create/moduser.js diff --git a/jonas/jonas/examples/olstore/olstoreweb/struts/error.jsp b/jonas/examples/olstore/olstoreweb/struts/error.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/struts/error.jsp rename to jonas/examples/olstore/olstoreweb/struts/error.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/struts/general/CreateUser.jsp b/jonas/examples/olstore/olstoreweb/struts/general/CreateUser.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/struts/general/CreateUser.jsp rename to jonas/examples/olstore/olstoreweb/struts/general/CreateUser.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/struts/general/Messages.jsp b/jonas/examples/olstore/olstoreweb/struts/general/Messages.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/struts/general/Messages.jsp rename to jonas/examples/olstore/olstoreweb/struts/general/Messages.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/struts/general/UserCreateConfirm.jsp b/jonas/examples/olstore/olstoreweb/struts/general/UserCreateConfirm.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/struts/general/UserCreateConfirm.jsp rename to jonas/examples/olstore/olstoreweb/struts/general/UserCreateConfirm.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/struts/general/UserForm.jsp b/jonas/examples/olstore/olstoreweb/struts/general/UserForm.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/struts/general/UserForm.jsp rename to jonas/examples/olstore/olstoreweb/struts/general/UserForm.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/struts/general/help.jsp b/jonas/examples/olstore/olstoreweb/struts/general/help.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/struts/general/help.jsp rename to jonas/examples/olstore/olstoreweb/struts/general/help.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/struts/general/logo.png b/jonas/examples/olstore/olstoreweb/struts/general/logo.png similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/struts/general/logo.png rename to jonas/examples/olstore/olstoreweb/struts/general/logo.png diff --git a/jonas/jonas/examples/olstore/olstoreweb/struts/general/moduser.js b/jonas/examples/olstore/olstoreweb/struts/general/moduser.js similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/struts/general/moduser.js rename to jonas/examples/olstore/olstoreweb/struts/general/moduser.js diff --git a/jonas/jonas/examples/olstore/olstoreweb/struts/general/olstoreLogo.png b/jonas/examples/olstore/olstoreweb/struts/general/olstoreLogo.png similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/struts/general/olstoreLogo.png rename to jonas/examples/olstore/olstoreweb/struts/general/olstoreLogo.png diff --git a/jonas/jonas/examples/olstore/olstoreweb/struts/index.jsp b/jonas/examples/olstore/olstoreweb/struts/index.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/struts/index.jsp rename to jonas/examples/olstore/olstoreweb/struts/index.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/struts/login/addsession.jsp b/jonas/examples/olstore/olstoreweb/struts/login/addsession.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/struts/login/addsession.jsp rename to jonas/examples/olstore/olstoreweb/struts/login/addsession.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/struts/login/error.jsp b/jonas/examples/olstore/olstoreweb/struts/login/error.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/struts/login/error.jsp rename to jonas/examples/olstore/olstoreweb/struts/login/error.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/struts/login/error403.jsp b/jonas/examples/olstore/olstoreweb/struts/login/error403.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/struts/login/error403.jsp rename to jonas/examples/olstore/olstoreweb/struts/login/error403.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/struts/login/error404.jsp b/jonas/examples/olstore/olstoreweb/struts/login/error404.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/struts/login/error404.jsp rename to jonas/examples/olstore/olstoreweb/struts/login/error404.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/struts/login/login.jsp b/jonas/examples/olstore/olstoreweb/struts/login/login.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/struts/login/login.jsp rename to jonas/examples/olstore/olstoreweb/struts/login/login.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/struts/login/logout.jsp b/jonas/examples/olstore/olstoreweb/struts/login/logout.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/struts/login/logout.jsp rename to jonas/examples/olstore/olstoreweb/struts/login/logout.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/struts/nav/Footer.jsp b/jonas/examples/olstore/olstoreweb/struts/nav/Footer.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/struts/nav/Footer.jsp rename to jonas/examples/olstore/olstoreweb/struts/nav/Footer.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/struts/nav/Header.jsp b/jonas/examples/olstore/olstoreweb/struts/nav/Header.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/struts/nav/Header.jsp rename to jonas/examples/olstore/olstoreweb/struts/nav/Header.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/struts/nav/Left.jsp b/jonas/examples/olstore/olstoreweb/struts/nav/Left.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/struts/nav/Left.jsp rename to jonas/examples/olstore/olstoreweb/struts/nav/Left.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/struts/nav/loginHeader.jsp b/jonas/examples/olstore/olstoreweb/struts/nav/loginHeader.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/struts/nav/loginHeader.jsp rename to jonas/examples/olstore/olstoreweb/struts/nav/loginHeader.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/struts/views/FriendSetView.jsp b/jonas/examples/olstore/olstoreweb/struts/views/FriendSetView.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/struts/views/FriendSetView.jsp rename to jonas/examples/olstore/olstoreweb/struts/views/FriendSetView.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/struts/views/ItemDetailedView.jsp b/jonas/examples/olstore/olstoreweb/struts/views/ItemDetailedView.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/struts/views/ItemDetailedView.jsp rename to jonas/examples/olstore/olstoreweb/struts/views/ItemDetailedView.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/struts/views/ItemListView.jsp b/jonas/examples/olstore/olstoreweb/struts/views/ItemListView.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/struts/views/ItemListView.jsp rename to jonas/examples/olstore/olstoreweb/struts/views/ItemListView.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/struts/views/ItemPurchasedBy.jsp b/jonas/examples/olstore/olstoreweb/struts/views/ItemPurchasedBy.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/struts/views/ItemPurchasedBy.jsp rename to jonas/examples/olstore/olstoreweb/struts/views/ItemPurchasedBy.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/struts/views/ItemThumbView.jsp b/jonas/examples/olstore/olstoreweb/struts/views/ItemThumbView.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/struts/views/ItemThumbView.jsp rename to jonas/examples/olstore/olstoreweb/struts/views/ItemThumbView.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/struts/views/ItemView.jsp b/jonas/examples/olstore/olstoreweb/struts/views/ItemView.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/struts/views/ItemView.jsp rename to jonas/examples/olstore/olstoreweb/struts/views/ItemView.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/struts/views/ListCollection.jsp b/jonas/examples/olstore/olstoreweb/struts/views/ListCollection.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/struts/views/ListCollection.jsp rename to jonas/examples/olstore/olstoreweb/struts/views/ListCollection.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/struts/views/MyAccount.jsp b/jonas/examples/olstore/olstoreweb/struts/views/MyAccount.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/struts/views/MyAccount.jsp rename to jonas/examples/olstore/olstoreweb/struts/views/MyAccount.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/struts/views/MyItems.jsp b/jonas/examples/olstore/olstoreweb/struts/views/MyItems.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/struts/views/MyItems.jsp rename to jonas/examples/olstore/olstoreweb/struts/views/MyItems.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/struts/views/OrderListView.jsp b/jonas/examples/olstore/olstoreweb/struts/views/OrderListView.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/struts/views/OrderListView.jsp rename to jonas/examples/olstore/olstoreweb/struts/views/OrderListView.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/struts/views/PropertiesView.jsp b/jonas/examples/olstore/olstoreweb/struts/views/PropertiesView.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/struts/views/PropertiesView.jsp rename to jonas/examples/olstore/olstoreweb/struts/views/PropertiesView.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/struts/views/TypeView.jsp b/jonas/examples/olstore/olstoreweb/struts/views/TypeView.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/struts/views/TypeView.jsp rename to jonas/examples/olstore/olstoreweb/struts/views/TypeView.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/struts/views/UserDetailedView.jsp b/jonas/examples/olstore/olstoreweb/struts/views/UserDetailedView.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/struts/views/UserDetailedView.jsp rename to jonas/examples/olstore/olstoreweb/struts/views/UserDetailedView.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/struts/views/index.jsp b/jonas/examples/olstore/olstoreweb/struts/views/index.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/struts/views/index.jsp rename to jonas/examples/olstore/olstoreweb/struts/views/index.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/struts/views/viewAllItems.jsp b/jonas/examples/olstore/olstoreweb/struts/views/viewAllItems.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/struts/views/viewAllItems.jsp rename to jonas/examples/olstore/olstoreweb/struts/views/viewAllItems.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/struts/views/viewAllTypes.jsp b/jonas/examples/olstore/olstoreweb/struts/views/viewAllTypes.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/struts/views/viewAllTypes.jsp rename to jonas/examples/olstore/olstoreweb/struts/views/viewAllTypes.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/views/FriendSetView.jsp b/jonas/examples/olstore/olstoreweb/views/FriendSetView.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/views/FriendSetView.jsp rename to jonas/examples/olstore/olstoreweb/views/FriendSetView.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/views/ItemDetailedView.jsp b/jonas/examples/olstore/olstoreweb/views/ItemDetailedView.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/views/ItemDetailedView.jsp rename to jonas/examples/olstore/olstoreweb/views/ItemDetailedView.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/views/ItemListView.jsp b/jonas/examples/olstore/olstoreweb/views/ItemListView.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/views/ItemListView.jsp rename to jonas/examples/olstore/olstoreweb/views/ItemListView.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/views/ItemPurchasedBy.jsp b/jonas/examples/olstore/olstoreweb/views/ItemPurchasedBy.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/views/ItemPurchasedBy.jsp rename to jonas/examples/olstore/olstoreweb/views/ItemPurchasedBy.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/views/ItemThumbView.jsp b/jonas/examples/olstore/olstoreweb/views/ItemThumbView.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/views/ItemThumbView.jsp rename to jonas/examples/olstore/olstoreweb/views/ItemThumbView.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/views/ItemView.jsp b/jonas/examples/olstore/olstoreweb/views/ItemView.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/views/ItemView.jsp rename to jonas/examples/olstore/olstoreweb/views/ItemView.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/views/ListCollection.jsp b/jonas/examples/olstore/olstoreweb/views/ListCollection.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/views/ListCollection.jsp rename to jonas/examples/olstore/olstoreweb/views/ListCollection.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/views/MyAccount.jsp b/jonas/examples/olstore/olstoreweb/views/MyAccount.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/views/MyAccount.jsp rename to jonas/examples/olstore/olstoreweb/views/MyAccount.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/views/MyItems.jsp b/jonas/examples/olstore/olstoreweb/views/MyItems.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/views/MyItems.jsp rename to jonas/examples/olstore/olstoreweb/views/MyItems.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/views/OrderListView.jsp b/jonas/examples/olstore/olstoreweb/views/OrderListView.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/views/OrderListView.jsp rename to jonas/examples/olstore/olstoreweb/views/OrderListView.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/views/PropertiesView.jsp b/jonas/examples/olstore/olstoreweb/views/PropertiesView.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/views/PropertiesView.jsp rename to jonas/examples/olstore/olstoreweb/views/PropertiesView.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/views/TypeView.jsp b/jonas/examples/olstore/olstoreweb/views/TypeView.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/views/TypeView.jsp rename to jonas/examples/olstore/olstoreweb/views/TypeView.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/views/UserDetailedView.jsp b/jonas/examples/olstore/olstoreweb/views/UserDetailedView.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/views/UserDetailedView.jsp rename to jonas/examples/olstore/olstoreweb/views/UserDetailedView.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/views/index.jsp b/jonas/examples/olstore/olstoreweb/views/index.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/views/index.jsp rename to jonas/examples/olstore/olstoreweb/views/index.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/views/viewAllItems.jsp b/jonas/examples/olstore/olstoreweb/views/viewAllItems.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/views/viewAllItems.jsp rename to jonas/examples/olstore/olstoreweb/views/viewAllItems.jsp diff --git a/jonas/jonas/examples/olstore/olstoreweb/views/viewAllTypes.jsp b/jonas/examples/olstore/olstoreweb/views/viewAllTypes.jsp similarity index 100% rename from jonas/jonas/examples/olstore/olstoreweb/views/viewAllTypes.jsp rename to jonas/examples/olstore/olstoreweb/views/viewAllTypes.jsp diff --git a/jonas/jonas/examples/olstore/src-original/olstore/action/CheckOutAction.java b/jonas/examples/olstore/src-original/olstore/action/CheckOutAction.java similarity index 100% rename from jonas/jonas/examples/olstore/src-original/olstore/action/CheckOutAction.java rename to jonas/examples/olstore/src-original/olstore/action/CheckOutAction.java diff --git a/jonas/jonas/examples/olstore/src-original/olstore/action/DemoBaseAction.java b/jonas/examples/olstore/src-original/olstore/action/DemoBaseAction.java similarity index 100% rename from jonas/jonas/examples/olstore/src-original/olstore/action/DemoBaseAction.java rename to jonas/examples/olstore/src-original/olstore/action/DemoBaseAction.java diff --git a/jonas/jonas/examples/olstore/src-original/olstore/action/DemoBaseDispatchActions.java b/jonas/examples/olstore/src-original/olstore/action/DemoBaseDispatchActions.java similarity index 100% rename from jonas/jonas/examples/olstore/src-original/olstore/action/DemoBaseDispatchActions.java rename to jonas/examples/olstore/src-original/olstore/action/DemoBaseDispatchActions.java diff --git a/jonas/jonas/examples/olstore/src-original/olstore/action/ItemCreateAction.java b/jonas/examples/olstore/src-original/olstore/action/ItemCreateAction.java similarity index 100% rename from jonas/jonas/examples/olstore/src-original/olstore/action/ItemCreateAction.java rename to jonas/examples/olstore/src-original/olstore/action/ItemCreateAction.java diff --git a/jonas/jonas/examples/olstore/src-original/olstore/action/ItemDispatchActions.java b/jonas/examples/olstore/src-original/olstore/action/ItemDispatchActions.java similarity index 100% rename from jonas/jonas/examples/olstore/src-original/olstore/action/ItemDispatchActions.java rename to jonas/examples/olstore/src-original/olstore/action/ItemDispatchActions.java diff --git a/jonas/jonas/examples/olstore/src-original/olstore/action/ItemSaveAction.java b/jonas/examples/olstore/src-original/olstore/action/ItemSaveAction.java similarity index 100% rename from jonas/jonas/examples/olstore/src-original/olstore/action/ItemSaveAction.java rename to jonas/examples/olstore/src-original/olstore/action/ItemSaveAction.java diff --git a/jonas/jonas/examples/olstore/src-original/olstore/action/LoginAction.java b/jonas/examples/olstore/src-original/olstore/action/LoginAction.java similarity index 100% rename from jonas/jonas/examples/olstore/src-original/olstore/action/LoginAction.java rename to jonas/examples/olstore/src-original/olstore/action/LoginAction.java diff --git a/jonas/jonas/examples/olstore/src-original/olstore/action/OrderStatusAction.java b/jonas/examples/olstore/src-original/olstore/action/OrderStatusAction.java similarity index 100% rename from jonas/jonas/examples/olstore/src-original/olstore/action/OrderStatusAction.java rename to jonas/examples/olstore/src-original/olstore/action/OrderStatusAction.java diff --git a/jonas/jonas/examples/olstore/src-original/olstore/action/TypeCreateAction.java b/jonas/examples/olstore/src-original/olstore/action/TypeCreateAction.java similarity index 100% rename from jonas/jonas/examples/olstore/src-original/olstore/action/TypeCreateAction.java rename to jonas/examples/olstore/src-original/olstore/action/TypeCreateAction.java diff --git a/jonas/jonas/examples/olstore/src-original/olstore/action/TypeSaveAction.java b/jonas/examples/olstore/src-original/olstore/action/TypeSaveAction.java similarity index 100% rename from jonas/jonas/examples/olstore/src-original/olstore/action/TypeSaveAction.java rename to jonas/examples/olstore/src-original/olstore/action/TypeSaveAction.java diff --git a/jonas/jonas/examples/olstore/src-original/olstore/action/UserCreateAction.java b/jonas/examples/olstore/src-original/olstore/action/UserCreateAction.java similarity index 100% rename from jonas/jonas/examples/olstore/src-original/olstore/action/UserCreateAction.java rename to jonas/examples/olstore/src-original/olstore/action/UserCreateAction.java diff --git a/jonas/jonas/examples/olstore/src-original/olstore/action/UserModAction.java b/jonas/examples/olstore/src-original/olstore/action/UserModAction.java similarity index 100% rename from jonas/jonas/examples/olstore/src-original/olstore/action/UserModAction.java rename to jonas/examples/olstore/src-original/olstore/action/UserModAction.java diff --git a/jonas/jonas/examples/olstore/src-original/olstore/action/UserSaveAction.java b/jonas/examples/olstore/src-original/olstore/action/UserSaveAction.java similarity index 100% rename from jonas/jonas/examples/olstore/src-original/olstore/action/UserSaveAction.java rename to jonas/examples/olstore/src-original/olstore/action/UserSaveAction.java diff --git a/jonas/jonas/examples/olstore/src-original/olstore/action/UserUpdateAction.java b/jonas/examples/olstore/src-original/olstore/action/UserUpdateAction.java similarity index 100% rename from jonas/jonas/examples/olstore/src-original/olstore/action/UserUpdateAction.java rename to jonas/examples/olstore/src-original/olstore/action/UserUpdateAction.java diff --git a/jonas/jonas/examples/olstore/src-original/olstore/action/ViewItemAction.java b/jonas/examples/olstore/src-original/olstore/action/ViewItemAction.java similarity index 100% rename from jonas/jonas/examples/olstore/src-original/olstore/action/ViewItemAction.java rename to jonas/examples/olstore/src-original/olstore/action/ViewItemAction.java diff --git a/jonas/jonas/examples/olstore/src-original/olstore/dto/AddressValue.java b/jonas/examples/olstore/src-original/olstore/dto/AddressValue.java similarity index 100% rename from jonas/jonas/examples/olstore/src-original/olstore/dto/AddressValue.java rename to jonas/examples/olstore/src-original/olstore/dto/AddressValue.java diff --git a/jonas/jonas/examples/olstore/src-original/olstore/dto/CreateUserValue.java b/jonas/examples/olstore/src-original/olstore/dto/CreateUserValue.java similarity index 100% rename from jonas/jonas/examples/olstore/src-original/olstore/dto/CreateUserValue.java rename to jonas/examples/olstore/src-original/olstore/dto/CreateUserValue.java diff --git a/jonas/jonas/examples/olstore/src-original/olstore/dto/ItemValue.java b/jonas/examples/olstore/src-original/olstore/dto/ItemValue.java similarity index 100% rename from jonas/jonas/examples/olstore/src-original/olstore/dto/ItemValue.java rename to jonas/examples/olstore/src-original/olstore/dto/ItemValue.java diff --git a/jonas/jonas/examples/olstore/src-original/olstore/dto/OrderEntry.java b/jonas/examples/olstore/src-original/olstore/dto/OrderEntry.java similarity index 100% rename from jonas/jonas/examples/olstore/src-original/olstore/dto/OrderEntry.java rename to jonas/examples/olstore/src-original/olstore/dto/OrderEntry.java diff --git a/jonas/jonas/examples/olstore/src-original/olstore/dto/PictureValue.java b/jonas/examples/olstore/src-original/olstore/dto/PictureValue.java similarity index 100% rename from jonas/jonas/examples/olstore/src-original/olstore/dto/PictureValue.java rename to jonas/examples/olstore/src-original/olstore/dto/PictureValue.java diff --git a/jonas/jonas/examples/olstore/src-original/olstore/dto/PropertyValue.java b/jonas/examples/olstore/src-original/olstore/dto/PropertyValue.java similarity index 100% rename from jonas/jonas/examples/olstore/src-original/olstore/dto/PropertyValue.java rename to jonas/examples/olstore/src-original/olstore/dto/PropertyValue.java diff --git a/jonas/jonas/examples/olstore/src-original/olstore/dto/ShoppingCartItem.java b/jonas/examples/olstore/src-original/olstore/dto/ShoppingCartItem.java similarity index 100% rename from jonas/jonas/examples/olstore/src-original/olstore/dto/ShoppingCartItem.java rename to jonas/examples/olstore/src-original/olstore/dto/ShoppingCartItem.java diff --git a/jonas/jonas/examples/olstore/src-original/olstore/dto/TypeValue.java b/jonas/examples/olstore/src-original/olstore/dto/TypeValue.java similarity index 100% rename from jonas/jonas/examples/olstore/src-original/olstore/dto/TypeValue.java rename to jonas/examples/olstore/src-original/olstore/dto/TypeValue.java diff --git a/jonas/jonas/examples/olstore/src-original/olstore/dto/UserValue.java b/jonas/examples/olstore/src-original/olstore/dto/UserValue.java similarity index 100% rename from jonas/jonas/examples/olstore/src-original/olstore/dto/UserValue.java rename to jonas/examples/olstore/src-original/olstore/dto/UserValue.java diff --git a/jonas/jonas/examples/olstore/src-original/olstore/entity/AddressBean.java b/jonas/examples/olstore/src-original/olstore/entity/AddressBean.java similarity index 100% rename from jonas/jonas/examples/olstore/src-original/olstore/entity/AddressBean.java rename to jonas/examples/olstore/src-original/olstore/entity/AddressBean.java diff --git a/jonas/jonas/examples/olstore/src-original/olstore/entity/FriendBean.java b/jonas/examples/olstore/src-original/olstore/entity/FriendBean.java similarity index 100% rename from jonas/jonas/examples/olstore/src-original/olstore/entity/FriendBean.java rename to jonas/examples/olstore/src-original/olstore/entity/FriendBean.java diff --git a/jonas/jonas/examples/olstore/src-original/olstore/entity/ItemBean.java b/jonas/examples/olstore/src-original/olstore/entity/ItemBean.java similarity index 100% rename from jonas/jonas/examples/olstore/src-original/olstore/entity/ItemBean.java rename to jonas/examples/olstore/src-original/olstore/entity/ItemBean.java diff --git a/jonas/jonas/examples/olstore/src-original/olstore/entity/OrderBean.java b/jonas/examples/olstore/src-original/olstore/entity/OrderBean.java similarity index 100% rename from jonas/jonas/examples/olstore/src-original/olstore/entity/OrderBean.java rename to jonas/examples/olstore/src-original/olstore/entity/OrderBean.java diff --git a/jonas/jonas/examples/olstore/src-original/olstore/entity/PictureBean.java b/jonas/examples/olstore/src-original/olstore/entity/PictureBean.java similarity index 100% rename from jonas/jonas/examples/olstore/src-original/olstore/entity/PictureBean.java rename to jonas/examples/olstore/src-original/olstore/entity/PictureBean.java diff --git a/jonas/jonas/examples/olstore/src-original/olstore/entity/PropertyBean.java b/jonas/examples/olstore/src-original/olstore/entity/PropertyBean.java similarity index 100% rename from jonas/jonas/examples/olstore/src-original/olstore/entity/PropertyBean.java rename to jonas/examples/olstore/src-original/olstore/entity/PropertyBean.java diff --git a/jonas/jonas/examples/olstore/src-original/olstore/entity/TypeBean.java b/jonas/examples/olstore/src-original/olstore/entity/TypeBean.java similarity index 100% rename from jonas/jonas/examples/olstore/src-original/olstore/entity/TypeBean.java rename to jonas/examples/olstore/src-original/olstore/entity/TypeBean.java diff --git a/jonas/jonas/examples/olstore/src-original/olstore/entity/UserBean.java b/jonas/examples/olstore/src-original/olstore/entity/UserBean.java similarity index 100% rename from jonas/jonas/examples/olstore/src-original/olstore/entity/UserBean.java rename to jonas/examples/olstore/src-original/olstore/entity/UserBean.java diff --git a/jonas/jonas/examples/olstore/src-original/olstore/form/CheckoutForm.java b/jonas/examples/olstore/src-original/olstore/form/CheckoutForm.java similarity index 100% rename from jonas/jonas/examples/olstore/src-original/olstore/form/CheckoutForm.java rename to jonas/examples/olstore/src-original/olstore/form/CheckoutForm.java diff --git a/jonas/jonas/examples/olstore/src-original/olstore/form/CreateItemForm.java b/jonas/examples/olstore/src-original/olstore/form/CreateItemForm.java similarity index 100% rename from jonas/jonas/examples/olstore/src-original/olstore/form/CreateItemForm.java rename to jonas/examples/olstore/src-original/olstore/form/CreateItemForm.java diff --git a/jonas/jonas/examples/olstore/src-original/olstore/form/CreateTypeForm.java b/jonas/examples/olstore/src-original/olstore/form/CreateTypeForm.java similarity index 100% rename from jonas/jonas/examples/olstore/src-original/olstore/form/CreateTypeForm.java rename to jonas/examples/olstore/src-original/olstore/form/CreateTypeForm.java diff --git a/jonas/jonas/examples/olstore/src-original/olstore/form/DemoBaseForm.java b/jonas/examples/olstore/src-original/olstore/form/DemoBaseForm.java similarity index 100% rename from jonas/jonas/examples/olstore/src-original/olstore/form/DemoBaseForm.java rename to jonas/examples/olstore/src-original/olstore/form/DemoBaseForm.java diff --git a/jonas/jonas/examples/olstore/src-original/olstore/form/DemoDynaBaseForm.java b/jonas/examples/olstore/src-original/olstore/form/DemoDynaBaseForm.java similarity index 100% rename from jonas/jonas/examples/olstore/src-original/olstore/form/DemoDynaBaseForm.java rename to jonas/examples/olstore/src-original/olstore/form/DemoDynaBaseForm.java diff --git a/jonas/jonas/examples/olstore/src-original/olstore/form/UpdateOrderStatusForm.java b/jonas/examples/olstore/src-original/olstore/form/UpdateOrderStatusForm.java similarity index 100% rename from jonas/jonas/examples/olstore/src-original/olstore/form/UpdateOrderStatusForm.java rename to jonas/examples/olstore/src-original/olstore/form/UpdateOrderStatusForm.java diff --git a/jonas/jonas/examples/olstore/src-original/olstore/framework/EJBHomeFactory.java b/jonas/examples/olstore/src-original/olstore/framework/EJBHomeFactory.java similarity index 100% rename from jonas/jonas/examples/olstore/src-original/olstore/framework/EJBHomeFactory.java rename to jonas/examples/olstore/src-original/olstore/framework/EJBHomeFactory.java diff --git a/jonas/jonas/examples/olstore/src-original/olstore/global/DemoRequestProcessor.java b/jonas/examples/olstore/src-original/olstore/global/DemoRequestProcessor.java similarity index 100% rename from jonas/jonas/examples/olstore/src-original/olstore/global/DemoRequestProcessor.java rename to jonas/examples/olstore/src-original/olstore/global/DemoRequestProcessor.java diff --git a/jonas/jonas/examples/olstore/src-original/olstore/global/LoginException.java b/jonas/examples/olstore/src-original/olstore/global/LoginException.java similarity index 100% rename from jonas/jonas/examples/olstore/src-original/olstore/global/LoginException.java rename to jonas/examples/olstore/src-original/olstore/global/LoginException.java diff --git a/jonas/jonas/examples/olstore/src-original/olstore/session/ShoppingCartBean.java b/jonas/examples/olstore/src-original/olstore/session/ShoppingCartBean.java similarity index 100% rename from jonas/jonas/examples/olstore/src-original/olstore/session/ShoppingCartBean.java rename to jonas/examples/olstore/src-original/olstore/session/ShoppingCartBean.java diff --git a/jonas/jonas/examples/olstore/src-original/olstore/session/helper/ItemHelperBean.java b/jonas/examples/olstore/src-original/olstore/session/helper/ItemHelperBean.java similarity index 100% rename from jonas/jonas/examples/olstore/src-original/olstore/session/helper/ItemHelperBean.java rename to jonas/examples/olstore/src-original/olstore/session/helper/ItemHelperBean.java diff --git a/jonas/jonas/examples/olstore/src-original/olstore/session/helper/ItemSpecialHelper.java b/jonas/examples/olstore/src-original/olstore/session/helper/ItemSpecialHelper.java similarity index 100% rename from jonas/jonas/examples/olstore/src-original/olstore/session/helper/ItemSpecialHelper.java rename to jonas/examples/olstore/src-original/olstore/session/helper/ItemSpecialHelper.java diff --git a/jonas/jonas/examples/olstore/src-original/olstore/session/helper/ItemSpecialHelperBean.java b/jonas/examples/olstore/src-original/olstore/session/helper/ItemSpecialHelperBean.java similarity index 100% rename from jonas/jonas/examples/olstore/src-original/olstore/session/helper/ItemSpecialHelperBean.java rename to jonas/examples/olstore/src-original/olstore/session/helper/ItemSpecialHelperBean.java diff --git a/jonas/jonas/examples/olstore/src-original/olstore/session/helper/ShoppingCartHelper.java b/jonas/examples/olstore/src-original/olstore/session/helper/ShoppingCartHelper.java similarity index 100% rename from jonas/jonas/examples/olstore/src-original/olstore/session/helper/ShoppingCartHelper.java rename to jonas/examples/olstore/src-original/olstore/session/helper/ShoppingCartHelper.java diff --git a/jonas/jonas/examples/olstore/src-original/olstore/session/helper/ShoppingCartHelperBean.java b/jonas/examples/olstore/src-original/olstore/session/helper/ShoppingCartHelperBean.java similarity index 100% rename from jonas/jonas/examples/olstore/src-original/olstore/session/helper/ShoppingCartHelperBean.java rename to jonas/examples/olstore/src-original/olstore/session/helper/ShoppingCartHelperBean.java diff --git a/jonas/jonas/examples/olstore/src-original/olstore/session/helper/TypeHelperBean.java b/jonas/examples/olstore/src-original/olstore/session/helper/TypeHelperBean.java similarity index 100% rename from jonas/jonas/examples/olstore/src-original/olstore/session/helper/TypeHelperBean.java rename to jonas/examples/olstore/src-original/olstore/session/helper/TypeHelperBean.java diff --git a/jonas/jonas/examples/olstore/src-original/olstore/session/helper/UserHelperBean.java b/jonas/examples/olstore/src-original/olstore/session/helper/UserHelperBean.java similarity index 100% rename from jonas/jonas/examples/olstore/src-original/olstore/session/helper/UserHelperBean.java rename to jonas/examples/olstore/src-original/olstore/session/helper/UserHelperBean.java diff --git a/jonas/jonas/examples/olstore/src-original/olstore/util/WebUtils.java b/jonas/examples/olstore/src-original/olstore/util/WebUtils.java similarity index 100% rename from jonas/jonas/examples/olstore/src-original/olstore/util/WebUtils.java rename to jonas/examples/olstore/src-original/olstore/util/WebUtils.java diff --git a/jonas/jonas/examples/olstore/src-original/olstore/validation/Validator.java b/jonas/examples/olstore/src-original/olstore/validation/Validator.java similarity index 100% rename from jonas/jonas/examples/olstore/src-original/olstore/validation/Validator.java rename to jonas/examples/olstore/src-original/olstore/validation/Validator.java diff --git a/jonas/jonas/examples/olstore/src/ChangeLog b/jonas/examples/olstore/src/ChangeLog similarity index 100% rename from jonas/jonas/examples/olstore/src/ChangeLog rename to jonas/examples/olstore/src/ChangeLog diff --git a/jonas/jonas/examples/olstore/src/olstore/action/CheckOutAction.java b/jonas/examples/olstore/src/olstore/action/CheckOutAction.java similarity index 100% rename from jonas/jonas/examples/olstore/src/olstore/action/CheckOutAction.java rename to jonas/examples/olstore/src/olstore/action/CheckOutAction.java diff --git a/jonas/jonas/examples/olstore/src/olstore/action/DemoBaseAction.java b/jonas/examples/olstore/src/olstore/action/DemoBaseAction.java similarity index 100% rename from jonas/jonas/examples/olstore/src/olstore/action/DemoBaseAction.java rename to jonas/examples/olstore/src/olstore/action/DemoBaseAction.java diff --git a/jonas/jonas/examples/olstore/src/olstore/action/DemoBaseDispatchActions.java b/jonas/examples/olstore/src/olstore/action/DemoBaseDispatchActions.java similarity index 100% rename from jonas/jonas/examples/olstore/src/olstore/action/DemoBaseDispatchActions.java rename to jonas/examples/olstore/src/olstore/action/DemoBaseDispatchActions.java diff --git a/jonas/jonas/examples/olstore/src/olstore/action/ItemCreateAction.java b/jonas/examples/olstore/src/olstore/action/ItemCreateAction.java similarity index 100% rename from jonas/jonas/examples/olstore/src/olstore/action/ItemCreateAction.java rename to jonas/examples/olstore/src/olstore/action/ItemCreateAction.java diff --git a/jonas/jonas/examples/olstore/src/olstore/action/ItemDispatchActions.java b/jonas/examples/olstore/src/olstore/action/ItemDispatchActions.java similarity index 100% rename from jonas/jonas/examples/olstore/src/olstore/action/ItemDispatchActions.java rename to jonas/examples/olstore/src/olstore/action/ItemDispatchActions.java diff --git a/jonas/jonas/examples/olstore/src/olstore/action/ItemSaveAction.java b/jonas/examples/olstore/src/olstore/action/ItemSaveAction.java similarity index 100% rename from jonas/jonas/examples/olstore/src/olstore/action/ItemSaveAction.java rename to jonas/examples/olstore/src/olstore/action/ItemSaveAction.java diff --git a/jonas/jonas/examples/olstore/src/olstore/action/LoginAction.java b/jonas/examples/olstore/src/olstore/action/LoginAction.java similarity index 100% rename from jonas/jonas/examples/olstore/src/olstore/action/LoginAction.java rename to jonas/examples/olstore/src/olstore/action/LoginAction.java diff --git a/jonas/jonas/examples/olstore/src/olstore/action/OrderStatusAction.java b/jonas/examples/olstore/src/olstore/action/OrderStatusAction.java similarity index 100% rename from jonas/jonas/examples/olstore/src/olstore/action/OrderStatusAction.java rename to jonas/examples/olstore/src/olstore/action/OrderStatusAction.java diff --git a/jonas/jonas/examples/olstore/src/olstore/action/TypeCreateAction.java b/jonas/examples/olstore/src/olstore/action/TypeCreateAction.java similarity index 100% rename from jonas/jonas/examples/olstore/src/olstore/action/TypeCreateAction.java rename to jonas/examples/olstore/src/olstore/action/TypeCreateAction.java diff --git a/jonas/jonas/examples/olstore/src/olstore/action/TypeSaveAction.java b/jonas/examples/olstore/src/olstore/action/TypeSaveAction.java similarity index 100% rename from jonas/jonas/examples/olstore/src/olstore/action/TypeSaveAction.java rename to jonas/examples/olstore/src/olstore/action/TypeSaveAction.java diff --git a/jonas/jonas/examples/olstore/src/olstore/action/UserCreateAction.java b/jonas/examples/olstore/src/olstore/action/UserCreateAction.java similarity index 100% rename from jonas/jonas/examples/olstore/src/olstore/action/UserCreateAction.java rename to jonas/examples/olstore/src/olstore/action/UserCreateAction.java diff --git a/jonas/jonas/examples/olstore/src/olstore/action/UserModAction.java b/jonas/examples/olstore/src/olstore/action/UserModAction.java similarity index 100% rename from jonas/jonas/examples/olstore/src/olstore/action/UserModAction.java rename to jonas/examples/olstore/src/olstore/action/UserModAction.java diff --git a/jonas/jonas/examples/olstore/src/olstore/action/UserSaveAction.java b/jonas/examples/olstore/src/olstore/action/UserSaveAction.java similarity index 100% rename from jonas/jonas/examples/olstore/src/olstore/action/UserSaveAction.java rename to jonas/examples/olstore/src/olstore/action/UserSaveAction.java diff --git a/jonas/jonas/examples/olstore/src/olstore/action/UserUpdateAction.java b/jonas/examples/olstore/src/olstore/action/UserUpdateAction.java similarity index 100% rename from jonas/jonas/examples/olstore/src/olstore/action/UserUpdateAction.java rename to jonas/examples/olstore/src/olstore/action/UserUpdateAction.java diff --git a/jonas/jonas/examples/olstore/src/olstore/action/ViewItemAction.java b/jonas/examples/olstore/src/olstore/action/ViewItemAction.java similarity index 100% rename from jonas/jonas/examples/olstore/src/olstore/action/ViewItemAction.java rename to jonas/examples/olstore/src/olstore/action/ViewItemAction.java diff --git a/jonas/jonas/examples/olstore/src/olstore/controller/AddItemToCartController.java b/jonas/examples/olstore/src/olstore/controller/AddItemToCartController.java similarity index 100% rename from jonas/jonas/examples/olstore/src/olstore/controller/AddItemToCartController.java rename to jonas/examples/olstore/src/olstore/controller/AddItemToCartController.java diff --git a/jonas/jonas/examples/olstore/src/olstore/controller/ControllerHelper.java b/jonas/examples/olstore/src/olstore/controller/ControllerHelper.java similarity index 100% rename from jonas/jonas/examples/olstore/src/olstore/controller/ControllerHelper.java rename to jonas/examples/olstore/src/olstore/controller/ControllerHelper.java diff --git a/jonas/jonas/examples/olstore/src/olstore/controller/CreateTypeController.java b/jonas/examples/olstore/src/olstore/controller/CreateTypeController.java similarity index 100% rename from jonas/jonas/examples/olstore/src/olstore/controller/CreateTypeController.java rename to jonas/examples/olstore/src/olstore/controller/CreateTypeController.java diff --git a/jonas/jonas/examples/olstore/src/olstore/controller/CreateUserController.java b/jonas/examples/olstore/src/olstore/controller/CreateUserController.java similarity index 100% rename from jonas/jonas/examples/olstore/src/olstore/controller/CreateUserController.java rename to jonas/examples/olstore/src/olstore/controller/CreateUserController.java diff --git a/jonas/jonas/examples/olstore/src/olstore/controller/EditUserController.java b/jonas/examples/olstore/src/olstore/controller/EditUserController.java similarity index 100% rename from jonas/jonas/examples/olstore/src/olstore/controller/EditUserController.java rename to jonas/examples/olstore/src/olstore/controller/EditUserController.java diff --git a/jonas/jonas/examples/olstore/src/olstore/controller/ItemController.java b/jonas/examples/olstore/src/olstore/controller/ItemController.java similarity index 100% rename from jonas/jonas/examples/olstore/src/olstore/controller/ItemController.java rename to jonas/examples/olstore/src/olstore/controller/ItemController.java diff --git a/jonas/jonas/examples/olstore/src/olstore/controller/ListItemsController.java b/jonas/examples/olstore/src/olstore/controller/ListItemsController.java similarity index 100% rename from jonas/jonas/examples/olstore/src/olstore/controller/ListItemsController.java rename to jonas/examples/olstore/src/olstore/controller/ListItemsController.java diff --git a/jonas/jonas/examples/olstore/src/olstore/controller/OrderFormHelper.java b/jonas/examples/olstore/src/olstore/controller/OrderFormHelper.java similarity index 100% rename from jonas/jonas/examples/olstore/src/olstore/controller/OrderFormHelper.java rename to jonas/examples/olstore/src/olstore/controller/OrderFormHelper.java diff --git a/jonas/jonas/examples/olstore/src/olstore/controller/PopulateController.java b/jonas/examples/olstore/src/olstore/controller/PopulateController.java similarity index 100% rename from jonas/jonas/examples/olstore/src/olstore/controller/PopulateController.java rename to jonas/examples/olstore/src/olstore/controller/PopulateController.java diff --git a/jonas/jonas/examples/olstore/src/olstore/controller/PopulateProgressController.java b/jonas/examples/olstore/src/olstore/controller/PopulateProgressController.java similarity index 100% rename from jonas/jonas/examples/olstore/src/olstore/controller/PopulateProgressController.java rename to jonas/examples/olstore/src/olstore/controller/PopulateProgressController.java diff --git a/jonas/jonas/examples/olstore/src/olstore/controller/ShoppingCartController.java b/jonas/examples/olstore/src/olstore/controller/ShoppingCartController.java similarity index 100% rename from jonas/jonas/examples/olstore/src/olstore/controller/ShoppingCartController.java rename to jonas/examples/olstore/src/olstore/controller/ShoppingCartController.java diff --git a/jonas/jonas/examples/olstore/src/olstore/controller/ShoppingCartInterceptor.java b/jonas/examples/olstore/src/olstore/controller/ShoppingCartInterceptor.java similarity index 100% rename from jonas/jonas/examples/olstore/src/olstore/controller/ShoppingCartInterceptor.java rename to jonas/examples/olstore/src/olstore/controller/ShoppingCartInterceptor.java diff --git a/jonas/jonas/examples/olstore/src/olstore/controller/SignOutController.java b/jonas/examples/olstore/src/olstore/controller/SignOutController.java similarity index 100% rename from jonas/jonas/examples/olstore/src/olstore/controller/SignOutController.java rename to jonas/examples/olstore/src/olstore/controller/SignOutController.java diff --git a/jonas/jonas/examples/olstore/src/olstore/controller/SigninController.java b/jonas/examples/olstore/src/olstore/controller/SigninController.java similarity index 100% rename from jonas/jonas/examples/olstore/src/olstore/controller/SigninController.java rename to jonas/examples/olstore/src/olstore/controller/SigninController.java diff --git a/jonas/jonas/examples/olstore/src/olstore/controller/SigninFailController.java b/jonas/examples/olstore/src/olstore/controller/SigninFailController.java similarity index 100% rename from jonas/jonas/examples/olstore/src/olstore/controller/SigninFailController.java rename to jonas/examples/olstore/src/olstore/controller/SigninFailController.java diff --git a/jonas/jonas/examples/olstore/src/olstore/controller/UpdateOrderController.java b/jonas/examples/olstore/src/olstore/controller/UpdateOrderController.java similarity index 100% rename from jonas/jonas/examples/olstore/src/olstore/controller/UpdateOrderController.java rename to jonas/examples/olstore/src/olstore/controller/UpdateOrderController.java diff --git a/jonas/jonas/examples/olstore/src/olstore/controller/UserForm.java b/jonas/examples/olstore/src/olstore/controller/UserForm.java similarity index 100% rename from jonas/jonas/examples/olstore/src/olstore/controller/UserForm.java rename to jonas/examples/olstore/src/olstore/controller/UserForm.java diff --git a/jonas/jonas/examples/olstore/src/olstore/controller/ViewIndexController.java b/jonas/examples/olstore/src/olstore/controller/ViewIndexController.java similarity index 100% rename from jonas/jonas/examples/olstore/src/olstore/controller/ViewIndexController.java rename to jonas/examples/olstore/src/olstore/controller/ViewIndexController.java diff --git a/jonas/jonas/examples/olstore/src/olstore/controller/ViewItemController.java b/jonas/examples/olstore/src/olstore/controller/ViewItemController.java similarity index 100% rename from jonas/jonas/examples/olstore/src/olstore/controller/ViewItemController.java rename to jonas/examples/olstore/src/olstore/controller/ViewItemController.java diff --git a/jonas/jonas/examples/olstore/src/olstore/controller/ViewMyItemsController.java b/jonas/examples/olstore/src/olstore/controller/ViewMyItemsController.java similarity index 100% rename from jonas/jonas/examples/olstore/src/olstore/controller/ViewMyItemsController.java rename to jonas/examples/olstore/src/olstore/controller/ViewMyItemsController.java diff --git a/jonas/jonas/examples/olstore/src/olstore/controller/ViewOrdersController.java b/jonas/examples/olstore/src/olstore/controller/ViewOrdersController.java similarity index 100% rename from jonas/jonas/examples/olstore/src/olstore/controller/ViewOrdersController.java rename to jonas/examples/olstore/src/olstore/controller/ViewOrdersController.java diff --git a/jonas/jonas/examples/olstore/src/olstore/domain/logic/OlstoreFacade.java b/jonas/examples/olstore/src/olstore/domain/logic/OlstoreFacade.java similarity index 100% rename from jonas/jonas/examples/olstore/src/olstore/domain/logic/OlstoreFacade.java rename to jonas/examples/olstore/src/olstore/domain/logic/OlstoreFacade.java diff --git a/jonas/jonas/examples/olstore/src/olstore/domain/logic/OlstoreImpl.java b/jonas/examples/olstore/src/olstore/domain/logic/OlstoreImpl.java similarity index 100% rename from jonas/jonas/examples/olstore/src/olstore/domain/logic/OlstoreImpl.java rename to jonas/examples/olstore/src/olstore/domain/logic/OlstoreImpl.java diff --git a/jonas/jonas/examples/olstore/src/olstore/domain/manager/CartManager.java b/jonas/examples/olstore/src/olstore/domain/manager/CartManager.java similarity index 100% rename from jonas/jonas/examples/olstore/src/olstore/domain/manager/CartManager.java rename to jonas/examples/olstore/src/olstore/domain/manager/CartManager.java diff --git a/jonas/jonas/examples/olstore/src/olstore/domain/manager/ItemManager.java b/jonas/examples/olstore/src/olstore/domain/manager/ItemManager.java similarity index 100% rename from jonas/jonas/examples/olstore/src/olstore/domain/manager/ItemManager.java rename to jonas/examples/olstore/src/olstore/domain/manager/ItemManager.java diff --git a/jonas/jonas/examples/olstore/src/olstore/domain/manager/OrderManager.java b/jonas/examples/olstore/src/olstore/domain/manager/OrderManager.java similarity index 100% rename from jonas/jonas/examples/olstore/src/olstore/domain/manager/OrderManager.java rename to jonas/examples/olstore/src/olstore/domain/manager/OrderManager.java diff --git a/jonas/jonas/examples/olstore/src/olstore/domain/manager/TypeManager.java b/jonas/examples/olstore/src/olstore/domain/manager/TypeManager.java similarity index 100% rename from jonas/jonas/examples/olstore/src/olstore/domain/manager/TypeManager.java rename to jonas/examples/olstore/src/olstore/domain/manager/TypeManager.java diff --git a/jonas/jonas/examples/olstore/src/olstore/domain/manager/UserManager.java b/jonas/examples/olstore/src/olstore/domain/manager/UserManager.java similarity index 100% rename from jonas/jonas/examples/olstore/src/olstore/domain/manager/UserManager.java rename to jonas/examples/olstore/src/olstore/domain/manager/UserManager.java diff --git a/jonas/jonas/examples/olstore/src/olstore/dto/AddressValue.java b/jonas/examples/olstore/src/olstore/dto/AddressValue.java similarity index 100% rename from jonas/jonas/examples/olstore/src/olstore/dto/AddressValue.java rename to jonas/examples/olstore/src/olstore/dto/AddressValue.java diff --git a/jonas/jonas/examples/olstore/src/olstore/dto/CreateUserValue.java b/jonas/examples/olstore/src/olstore/dto/CreateUserValue.java similarity index 100% rename from jonas/jonas/examples/olstore/src/olstore/dto/CreateUserValue.java rename to jonas/examples/olstore/src/olstore/dto/CreateUserValue.java diff --git a/jonas/jonas/examples/olstore/src/olstore/dto/ItemValue.java b/jonas/examples/olstore/src/olstore/dto/ItemValue.java similarity index 100% rename from jonas/jonas/examples/olstore/src/olstore/dto/ItemValue.java rename to jonas/examples/olstore/src/olstore/dto/ItemValue.java diff --git a/jonas/jonas/examples/olstore/src/olstore/dto/OrderEntry.java b/jonas/examples/olstore/src/olstore/dto/OrderEntry.java similarity index 100% rename from jonas/jonas/examples/olstore/src/olstore/dto/OrderEntry.java rename to jonas/examples/olstore/src/olstore/dto/OrderEntry.java diff --git a/jonas/jonas/examples/olstore/src/olstore/dto/PictureValue.java b/jonas/examples/olstore/src/olstore/dto/PictureValue.java similarity index 100% rename from jonas/jonas/examples/olstore/src/olstore/dto/PictureValue.java rename to jonas/examples/olstore/src/olstore/dto/PictureValue.java diff --git a/jonas/jonas/examples/olstore/src/olstore/dto/PropertyValue.java b/jonas/examples/olstore/src/olstore/dto/PropertyValue.java similarity index 100% rename from jonas/jonas/examples/olstore/src/olstore/dto/PropertyValue.java rename to jonas/examples/olstore/src/olstore/dto/PropertyValue.java diff --git a/jonas/jonas/examples/olstore/src/olstore/dto/ShoppingCartItem.java b/jonas/examples/olstore/src/olstore/dto/ShoppingCartItem.java similarity index 100% rename from jonas/jonas/examples/olstore/src/olstore/dto/ShoppingCartItem.java rename to jonas/examples/olstore/src/olstore/dto/ShoppingCartItem.java diff --git a/jonas/jonas/examples/olstore/src/olstore/dto/TypeValue.java b/jonas/examples/olstore/src/olstore/dto/TypeValue.java similarity index 100% rename from jonas/jonas/examples/olstore/src/olstore/dto/TypeValue.java rename to jonas/examples/olstore/src/olstore/dto/TypeValue.java diff --git a/jonas/jonas/examples/olstore/src/olstore/dto/UserValue.java b/jonas/examples/olstore/src/olstore/dto/UserValue.java similarity index 100% rename from jonas/jonas/examples/olstore/src/olstore/dto/UserValue.java rename to jonas/examples/olstore/src/olstore/dto/UserValue.java diff --git a/jonas/jonas/examples/olstore/src/olstore/entity/AddressBean.java b/jonas/examples/olstore/src/olstore/entity/AddressBean.java similarity index 100% rename from jonas/jonas/examples/olstore/src/olstore/entity/AddressBean.java rename to jonas/examples/olstore/src/olstore/entity/AddressBean.java diff --git a/jonas/jonas/examples/olstore/src/olstore/entity/FriendBean.java b/jonas/examples/olstore/src/olstore/entity/FriendBean.java similarity index 100% rename from jonas/jonas/examples/olstore/src/olstore/entity/FriendBean.java rename to jonas/examples/olstore/src/olstore/entity/FriendBean.java diff --git a/jonas/jonas/examples/olstore/src/olstore/entity/ItemBean.java b/jonas/examples/olstore/src/olstore/entity/ItemBean.java similarity index 100% rename from jonas/jonas/examples/olstore/src/olstore/entity/ItemBean.java rename to jonas/examples/olstore/src/olstore/entity/ItemBean.java diff --git a/jonas/jonas/examples/olstore/src/olstore/entity/OrderBean.java b/jonas/examples/olstore/src/olstore/entity/OrderBean.java similarity index 100% rename from jonas/jonas/examples/olstore/src/olstore/entity/OrderBean.java rename to jonas/examples/olstore/src/olstore/entity/OrderBean.java diff --git a/jonas/jonas/examples/olstore/src/olstore/entity/PictureBean.java b/jonas/examples/olstore/src/olstore/entity/PictureBean.java similarity index 100% rename from jonas/jonas/examples/olstore/src/olstore/entity/PictureBean.java rename to jonas/examples/olstore/src/olstore/entity/PictureBean.java diff --git a/jonas/jonas/examples/olstore/src/olstore/entity/PropertyBean.java b/jonas/examples/olstore/src/olstore/entity/PropertyBean.java similarity index 100% rename from jonas/jonas/examples/olstore/src/olstore/entity/PropertyBean.java rename to jonas/examples/olstore/src/olstore/entity/PropertyBean.java diff --git a/jonas/jonas/examples/olstore/src/olstore/entity/TypeBean.java b/jonas/examples/olstore/src/olstore/entity/TypeBean.java similarity index 100% rename from jonas/jonas/examples/olstore/src/olstore/entity/TypeBean.java rename to jonas/examples/olstore/src/olstore/entity/TypeBean.java diff --git a/jonas/jonas/examples/olstore/src/olstore/entity/UserBean.java b/jonas/examples/olstore/src/olstore/entity/UserBean.java similarity index 100% rename from jonas/jonas/examples/olstore/src/olstore/entity/UserBean.java rename to jonas/examples/olstore/src/olstore/entity/UserBean.java diff --git a/jonas/jonas/examples/olstore/src/olstore/form/CheckoutForm.java b/jonas/examples/olstore/src/olstore/form/CheckoutForm.java similarity index 100% rename from jonas/jonas/examples/olstore/src/olstore/form/CheckoutForm.java rename to jonas/examples/olstore/src/olstore/form/CheckoutForm.java diff --git a/jonas/jonas/examples/olstore/src/olstore/form/CreateItemForm.java b/jonas/examples/olstore/src/olstore/form/CreateItemForm.java similarity index 100% rename from jonas/jonas/examples/olstore/src/olstore/form/CreateItemForm.java rename to jonas/examples/olstore/src/olstore/form/CreateItemForm.java diff --git a/jonas/jonas/examples/olstore/src/olstore/form/CreateTypeForm.java b/jonas/examples/olstore/src/olstore/form/CreateTypeForm.java similarity index 100% rename from jonas/jonas/examples/olstore/src/olstore/form/CreateTypeForm.java rename to jonas/examples/olstore/src/olstore/form/CreateTypeForm.java diff --git a/jonas/jonas/examples/olstore/src/olstore/form/DemoBaseForm.java b/jonas/examples/olstore/src/olstore/form/DemoBaseForm.java similarity index 100% rename from jonas/jonas/examples/olstore/src/olstore/form/DemoBaseForm.java rename to jonas/examples/olstore/src/olstore/form/DemoBaseForm.java diff --git a/jonas/jonas/examples/olstore/src/olstore/form/DemoDynaBaseForm.java b/jonas/examples/olstore/src/olstore/form/DemoDynaBaseForm.java similarity index 100% rename from jonas/jonas/examples/olstore/src/olstore/form/DemoDynaBaseForm.java rename to jonas/examples/olstore/src/olstore/form/DemoDynaBaseForm.java diff --git a/jonas/jonas/examples/olstore/src/olstore/form/UpdateOrderStatusForm.java b/jonas/examples/olstore/src/olstore/form/UpdateOrderStatusForm.java similarity index 100% rename from jonas/jonas/examples/olstore/src/olstore/form/UpdateOrderStatusForm.java rename to jonas/examples/olstore/src/olstore/form/UpdateOrderStatusForm.java diff --git a/jonas/jonas/examples/olstore/src/olstore/framework/EJBHomeFactory.java b/jonas/examples/olstore/src/olstore/framework/EJBHomeFactory.java similarity index 100% rename from jonas/jonas/examples/olstore/src/olstore/framework/EJBHomeFactory.java rename to jonas/examples/olstore/src/olstore/framework/EJBHomeFactory.java diff --git a/jonas/jonas/examples/olstore/src/olstore/global/DemoRequestProcessor.java b/jonas/examples/olstore/src/olstore/global/DemoRequestProcessor.java similarity index 100% rename from jonas/jonas/examples/olstore/src/olstore/global/DemoRequestProcessor.java rename to jonas/examples/olstore/src/olstore/global/DemoRequestProcessor.java diff --git a/jonas/jonas/examples/olstore/src/olstore/global/LoginException.java b/jonas/examples/olstore/src/olstore/global/LoginException.java similarity index 100% rename from jonas/jonas/examples/olstore/src/olstore/global/LoginException.java rename to jonas/examples/olstore/src/olstore/global/LoginException.java diff --git a/jonas/jonas/examples/olstore/src/olstore/session/ShoppingCart.java b/jonas/examples/olstore/src/olstore/session/ShoppingCart.java similarity index 100% rename from jonas/jonas/examples/olstore/src/olstore/session/ShoppingCart.java rename to jonas/examples/olstore/src/olstore/session/ShoppingCart.java diff --git a/jonas/jonas/examples/olstore/src/olstore/session/ShoppingCartBean.java b/jonas/examples/olstore/src/olstore/session/ShoppingCartBean.java similarity index 100% rename from jonas/jonas/examples/olstore/src/olstore/session/ShoppingCartBean.java rename to jonas/examples/olstore/src/olstore/session/ShoppingCartBean.java diff --git a/jonas/jonas/examples/olstore/src/olstore/session/helper/ItemHelper.java b/jonas/examples/olstore/src/olstore/session/helper/ItemHelper.java similarity index 100% rename from jonas/jonas/examples/olstore/src/olstore/session/helper/ItemHelper.java rename to jonas/examples/olstore/src/olstore/session/helper/ItemHelper.java diff --git a/jonas/jonas/examples/olstore/src/olstore/session/helper/ItemHelperBean.java b/jonas/examples/olstore/src/olstore/session/helper/ItemHelperBean.java similarity index 100% rename from jonas/jonas/examples/olstore/src/olstore/session/helper/ItemHelperBean.java rename to jonas/examples/olstore/src/olstore/session/helper/ItemHelperBean.java diff --git a/jonas/jonas/examples/olstore/src/olstore/session/helper/ItemSpecialHelper.java b/jonas/examples/olstore/src/olstore/session/helper/ItemSpecialHelper.java similarity index 100% rename from jonas/jonas/examples/olstore/src/olstore/session/helper/ItemSpecialHelper.java rename to jonas/examples/olstore/src/olstore/session/helper/ItemSpecialHelper.java diff --git a/jonas/jonas/examples/olstore/src/olstore/session/helper/ItemSpecialHelperBean.java b/jonas/examples/olstore/src/olstore/session/helper/ItemSpecialHelperBean.java similarity index 100% rename from jonas/jonas/examples/olstore/src/olstore/session/helper/ItemSpecialHelperBean.java rename to jonas/examples/olstore/src/olstore/session/helper/ItemSpecialHelperBean.java diff --git a/jonas/jonas/examples/olstore/src/olstore/session/helper/ShoppingCartHelper.java b/jonas/examples/olstore/src/olstore/session/helper/ShoppingCartHelper.java similarity index 100% rename from jonas/jonas/examples/olstore/src/olstore/session/helper/ShoppingCartHelper.java rename to jonas/examples/olstore/src/olstore/session/helper/ShoppingCartHelper.java diff --git a/jonas/jonas/examples/olstore/src/olstore/session/helper/ShoppingCartHelperBean.java b/jonas/examples/olstore/src/olstore/session/helper/ShoppingCartHelperBean.java similarity index 100% rename from jonas/jonas/examples/olstore/src/olstore/session/helper/ShoppingCartHelperBean.java rename to jonas/examples/olstore/src/olstore/session/helper/ShoppingCartHelperBean.java diff --git a/jonas/jonas/examples/olstore/src/olstore/session/helper/TypeHelper.java b/jonas/examples/olstore/src/olstore/session/helper/TypeHelper.java similarity index 100% rename from jonas/jonas/examples/olstore/src/olstore/session/helper/TypeHelper.java rename to jonas/examples/olstore/src/olstore/session/helper/TypeHelper.java diff --git a/jonas/jonas/examples/olstore/src/olstore/session/helper/TypeHelperBean.java b/jonas/examples/olstore/src/olstore/session/helper/TypeHelperBean.java similarity index 100% rename from jonas/jonas/examples/olstore/src/olstore/session/helper/TypeHelperBean.java rename to jonas/examples/olstore/src/olstore/session/helper/TypeHelperBean.java diff --git a/jonas/jonas/examples/olstore/src/olstore/session/helper/UserHelper.java b/jonas/examples/olstore/src/olstore/session/helper/UserHelper.java similarity index 100% rename from jonas/jonas/examples/olstore/src/olstore/session/helper/UserHelper.java rename to jonas/examples/olstore/src/olstore/session/helper/UserHelper.java diff --git a/jonas/jonas/examples/olstore/src/olstore/session/helper/UserHelperBean.java b/jonas/examples/olstore/src/olstore/session/helper/UserHelperBean.java similarity index 100% rename from jonas/jonas/examples/olstore/src/olstore/session/helper/UserHelperBean.java rename to jonas/examples/olstore/src/olstore/session/helper/UserHelperBean.java diff --git a/jonas/jonas/examples/olstore/src/olstore/util/WebUtils.java b/jonas/examples/olstore/src/olstore/util/WebUtils.java similarity index 100% rename from jonas/jonas/examples/olstore/src/olstore/util/WebUtils.java rename to jonas/examples/olstore/src/olstore/util/WebUtils.java diff --git a/jonas/jonas/examples/olstore/src/olstore/validation/Validator.java b/jonas/examples/olstore/src/olstore/validation/Validator.java similarity index 100% rename from jonas/jonas/examples/olstore/src/olstore/validation/Validator.java rename to jonas/examples/olstore/src/olstore/validation/Validator.java diff --git a/jonas/jonas/examples/petstore1.3/META-INF/MANIFEST.MF b/jonas/examples/petstore1.3/META-INF/MANIFEST.MF similarity index 100% rename from jonas/jonas/examples/petstore1.3/META-INF/MANIFEST.MF rename to jonas/examples/petstore1.3/META-INF/MANIFEST.MF diff --git a/jonas/jonas/examples/petstore1.3/README b/jonas/examples/petstore1.3/README similarity index 100% rename from jonas/jonas/examples/petstore1.3/README rename to jonas/examples/petstore1.3/README diff --git a/jonas/jonas/examples/petstore1.3/build.properties b/jonas/examples/petstore1.3/build.properties similarity index 100% rename from jonas/jonas/examples/petstore1.3/build.properties rename to jonas/examples/petstore1.3/build.properties diff --git a/jonas/jonas/examples/petstore1.3/build.xml b/jonas/examples/petstore1.3/build.xml similarity index 100% rename from jonas/jonas/examples/petstore1.3/build.xml rename to jonas/examples/petstore1.3/build.xml diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/apps/admin/src/application.xml b/jonas/examples/petstore1.3/jonas_petstore_src/apps/admin/src/application.xml similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/apps/admin/src/application.xml rename to jonas/examples/petstore1.3/jonas_petstore_src/apps/admin/src/application.xml diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/apps/admin/src/build.bat b/jonas/examples/petstore1.3/jonas_petstore_src/apps/admin/src/build.bat similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/apps/admin/src/build.bat rename to jonas/examples/petstore1.3/jonas_petstore_src/apps/admin/src/build.bat diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/apps/admin/src/build.sh b/jonas/examples/petstore1.3/jonas_petstore_src/apps/admin/src/build.sh similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/apps/admin/src/build.sh rename to jonas/examples/petstore1.3/jonas_petstore_src/apps/admin/src/build.sh diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/apps/admin/src/build.xml b/jonas/examples/petstore1.3/jonas_petstore_src/apps/admin/src/build.xml similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/apps/admin/src/build.xml rename to jonas/examples/petstore1.3/jonas_petstore_src/apps/admin/src/build.xml diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/apps/admin/src/docroot/WEB-INF/jonas-web.xml b/jonas/examples/petstore1.3/jonas_petstore_src/apps/admin/src/docroot/WEB-INF/jonas-web.xml similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/apps/admin/src/docroot/WEB-INF/jonas-web.xml rename to jonas/examples/petstore1.3/jonas_petstore_src/apps/admin/src/docroot/WEB-INF/jonas-web.xml diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/apps/admin/src/docroot/WEB-INF/modif.info b/jonas/examples/petstore1.3/jonas_petstore_src/apps/admin/src/docroot/WEB-INF/modif.info similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/apps/admin/src/docroot/WEB-INF/modif.info rename to jonas/examples/petstore1.3/jonas_petstore_src/apps/admin/src/docroot/WEB-INF/modif.info diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/apps/admin/src/docroot/WEB-INF/web-jetty.xml b/jonas/examples/petstore1.3/jonas_petstore_src/apps/admin/src/docroot/WEB-INF/web-jetty.xml similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/apps/admin/src/docroot/WEB-INF/web-jetty.xml rename to jonas/examples/petstore1.3/jonas_petstore_src/apps/admin/src/docroot/WEB-INF/web-jetty.xml diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/apps/admin/src/docroot/WEB-INF/web.xml b/jonas/examples/petstore1.3/jonas_petstore_src/apps/admin/src/docroot/WEB-INF/web.xml similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/apps/admin/src/docroot/WEB-INF/web.xml rename to jonas/examples/petstore1.3/jonas_petstore_src/apps/admin/src/docroot/WEB-INF/web.xml diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/apps/admin/src/modif.info b/jonas/examples/petstore1.3/jonas_petstore_src/apps/admin/src/modif.info similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/apps/admin/src/modif.info rename to jonas/examples/petstore1.3/jonas_petstore_src/apps/admin/src/modif.info diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/apps/build.xml b/jonas/examples/petstore1.3/jonas_petstore_src/apps/build.xml similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/apps/build.xml rename to jonas/examples/petstore1.3/jonas_petstore_src/apps/build.xml diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/apps/opc/src/application.xml b/jonas/examples/petstore1.3/jonas_petstore_src/apps/opc/src/application.xml similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/apps/opc/src/application.xml rename to jonas/examples/petstore1.3/jonas_petstore_src/apps/opc/src/application.xml diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/apps/opc/src/build.bat b/jonas/examples/petstore1.3/jonas_petstore_src/apps/opc/src/build.bat similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/apps/opc/src/build.bat rename to jonas/examples/petstore1.3/jonas_petstore_src/apps/opc/src/build.bat diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/apps/opc/src/build.sh b/jonas/examples/petstore1.3/jonas_petstore_src/apps/opc/src/build.sh similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/apps/opc/src/build.sh rename to jonas/examples/petstore1.3/jonas_petstore_src/apps/opc/src/build.sh diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/apps/opc/src/build.xml b/jonas/examples/petstore1.3/jonas_petstore_src/apps/opc/src/build.xml similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/apps/opc/src/build.xml rename to jonas/examples/petstore1.3/jonas_petstore_src/apps/opc/src/build.xml diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/apps/opc/src/ejb-jar.xml b/jonas/examples/petstore1.3/jonas_petstore_src/apps/opc/src/ejb-jar.xml similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/apps/opc/src/ejb-jar.xml rename to jonas/examples/petstore1.3/jonas_petstore_src/apps/opc/src/ejb-jar.xml diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/apps/opc/src/jonas-ejb-jar.xml b/jonas/examples/petstore1.3/jonas_petstore_src/apps/opc/src/jonas-ejb-jar.xml similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/apps/opc/src/jonas-ejb-jar.xml rename to jonas/examples/petstore1.3/jonas_petstore_src/apps/opc/src/jonas-ejb-jar.xml diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/apps/opc/src/modif.info b/jonas/examples/petstore1.3/jonas_petstore_src/apps/opc/src/modif.info similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/apps/opc/src/modif.info rename to jonas/examples/petstore1.3/jonas_petstore_src/apps/opc/src/modif.info diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/apps/petstore/src/build.bat b/jonas/examples/petstore1.3/jonas_petstore_src/apps/petstore/src/build.bat similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/apps/petstore/src/build.bat rename to jonas/examples/petstore1.3/jonas_petstore_src/apps/petstore/src/build.bat diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/apps/petstore/src/build.sh b/jonas/examples/petstore1.3/jonas_petstore_src/apps/petstore/src/build.sh similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/apps/petstore/src/build.sh rename to jonas/examples/petstore1.3/jonas_petstore_src/apps/petstore/src/build.sh diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/apps/petstore/src/build.xml b/jonas/examples/petstore1.3/jonas_petstore_src/apps/petstore/src/build.xml similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/apps/petstore/src/build.xml rename to jonas/examples/petstore1.3/jonas_petstore_src/apps/petstore/src/build.xml diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/apps/petstore/src/docroot/WEB-INF/jonas-web.xml b/jonas/examples/petstore1.3/jonas_petstore_src/apps/petstore/src/docroot/WEB-INF/jonas-web.xml similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/apps/petstore/src/docroot/WEB-INF/jonas-web.xml rename to jonas/examples/petstore1.3/jonas_petstore_src/apps/petstore/src/docroot/WEB-INF/jonas-web.xml diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/apps/petstore/src/docroot/WEB-INF/modif.info b/jonas/examples/petstore1.3/jonas_petstore_src/apps/petstore/src/docroot/WEB-INF/modif.info similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/apps/petstore/src/docroot/WEB-INF/modif.info rename to jonas/examples/petstore1.3/jonas_petstore_src/apps/petstore/src/docroot/WEB-INF/modif.info diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/apps/petstore/src/docroot/WEB-INF/web.xml b/jonas/examples/petstore1.3/jonas_petstore_src/apps/petstore/src/docroot/WEB-INF/web.xml similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/apps/petstore/src/docroot/WEB-INF/web.xml rename to jonas/examples/petstore1.3/jonas_petstore_src/apps/petstore/src/docroot/WEB-INF/web.xml diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/apps/petstore/src/jonas-ejb-jar.xml b/jonas/examples/petstore1.3/jonas_petstore_src/apps/petstore/src/jonas-ejb-jar.xml similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/apps/petstore/src/jonas-ejb-jar.xml rename to jonas/examples/petstore1.3/jonas_petstore_src/apps/petstore/src/jonas-ejb-jar.xml diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/apps/supplier/src/build.bat b/jonas/examples/petstore1.3/jonas_petstore_src/apps/supplier/src/build.bat similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/apps/supplier/src/build.bat rename to jonas/examples/petstore1.3/jonas_petstore_src/apps/supplier/src/build.bat diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/apps/supplier/src/build.sh b/jonas/examples/petstore1.3/jonas_petstore_src/apps/supplier/src/build.sh similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/apps/supplier/src/build.sh rename to jonas/examples/petstore1.3/jonas_petstore_src/apps/supplier/src/build.sh diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/apps/supplier/src/build.xml b/jonas/examples/petstore1.3/jonas_petstore_src/apps/supplier/src/build.xml similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/apps/supplier/src/build.xml rename to jonas/examples/petstore1.3/jonas_petstore_src/apps/supplier/src/build.xml diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/apps/supplier/src/docroot/WEB-INF/jonas-web.xml b/jonas/examples/petstore1.3/jonas_petstore_src/apps/supplier/src/docroot/WEB-INF/jonas-web.xml similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/apps/supplier/src/docroot/WEB-INF/jonas-web.xml rename to jonas/examples/petstore1.3/jonas_petstore_src/apps/supplier/src/docroot/WEB-INF/jonas-web.xml diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/apps/supplier/src/docroot/WEB-INF/modif.info b/jonas/examples/petstore1.3/jonas_petstore_src/apps/supplier/src/docroot/WEB-INF/modif.info similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/apps/supplier/src/docroot/WEB-INF/modif.info rename to jonas/examples/petstore1.3/jonas_petstore_src/apps/supplier/src/docroot/WEB-INF/modif.info diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/apps/supplier/src/docroot/WEB-INF/web-jetty.xml b/jonas/examples/petstore1.3/jonas_petstore_src/apps/supplier/src/docroot/WEB-INF/web-jetty.xml similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/apps/supplier/src/docroot/WEB-INF/web-jetty.xml rename to jonas/examples/petstore1.3/jonas_petstore_src/apps/supplier/src/docroot/WEB-INF/web-jetty.xml diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/apps/supplier/src/docroot/WEB-INF/web.xml b/jonas/examples/petstore1.3/jonas_petstore_src/apps/supplier/src/docroot/WEB-INF/web.xml similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/apps/supplier/src/docroot/WEB-INF/web.xml rename to jonas/examples/petstore1.3/jonas_petstore_src/apps/supplier/src/docroot/WEB-INF/web.xml diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/apps/supplier/src/jonas-ejb-jar.xml b/jonas/examples/petstore1.3/jonas_petstore_src/apps/supplier/src/jonas-ejb-jar.xml similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/apps/supplier/src/jonas-ejb-jar.xml rename to jonas/examples/petstore1.3/jonas_petstore_src/apps/supplier/src/jonas-ejb-jar.xml diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/address/src/build.xml b/jonas/examples/petstore1.3/jonas_petstore_src/components/address/src/build.xml similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/address/src/build.xml rename to jonas/examples/petstore1.3/jonas_petstore_src/components/address/src/build.xml diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/address/src/com/sun/j2ee/blueprints/address/ejb/AddressEJB.java b/jonas/examples/petstore1.3/jonas_petstore_src/components/address/src/com/sun/j2ee/blueprints/address/ejb/AddressEJB.java similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/address/src/com/sun/j2ee/blueprints/address/ejb/AddressEJB.java rename to jonas/examples/petstore1.3/jonas_petstore_src/components/address/src/com/sun/j2ee/blueprints/address/ejb/AddressEJB.java diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/address/src/ejb-jar.xml b/jonas/examples/petstore1.3/jonas_petstore_src/components/address/src/ejb-jar.xml similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/address/src/ejb-jar.xml rename to jonas/examples/petstore1.3/jonas_petstore_src/components/address/src/ejb-jar.xml diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/address/src/jonas-ejb-jar.xml b/jonas/examples/petstore1.3/jonas_petstore_src/components/address/src/jonas-ejb-jar.xml similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/address/src/jonas-ejb-jar.xml rename to jonas/examples/petstore1.3/jonas_petstore_src/components/address/src/jonas-ejb-jar.xml diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/asyncsender/src/Admin.xml b/jonas/examples/petstore1.3/jonas_petstore_src/components/asyncsender/src/Admin.xml similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/asyncsender/src/Admin.xml rename to jonas/examples/petstore1.3/jonas_petstore_src/components/asyncsender/src/Admin.xml diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/asyncsender/src/build.xml b/jonas/examples/petstore1.3/jonas_petstore_src/components/asyncsender/src/build.xml similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/asyncsender/src/build.xml rename to jonas/examples/petstore1.3/jonas_petstore_src/components/asyncsender/src/build.xml diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/asyncsender/src/jonas-Admin.xml b/jonas/examples/petstore1.3/jonas_petstore_src/components/asyncsender/src/jonas-Admin.xml similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/asyncsender/src/jonas-Admin.xml rename to jonas/examples/petstore1.3/jonas_petstore_src/components/asyncsender/src/jonas-Admin.xml diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/asyncsender/src/jonas-ejb-jar.xml b/jonas/examples/petstore1.3/jonas_petstore_src/components/asyncsender/src/jonas-ejb-jar.xml similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/asyncsender/src/jonas-ejb-jar.xml rename to jonas/examples/petstore1.3/jonas_petstore_src/components/asyncsender/src/jonas-ejb-jar.xml diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/asyncsender/src/modif.info b/jonas/examples/petstore1.3/jonas_petstore_src/components/asyncsender/src/modif.info similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/asyncsender/src/modif.info rename to jonas/examples/petstore1.3/jonas_petstore_src/components/asyncsender/src/modif.info diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/build.xml b/jonas/examples/petstore1.3/jonas_petstore_src/components/build.xml similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/build.xml rename to jonas/examples/petstore1.3/jonas_petstore_src/components/build.xml diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/cart/src/build.xml b/jonas/examples/petstore1.3/jonas_petstore_src/components/cart/src/build.xml similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/cart/src/build.xml rename to jonas/examples/petstore1.3/jonas_petstore_src/components/cart/src/build.xml diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/cart/src/jonas-ejb-jar.xml b/jonas/examples/petstore1.3/jonas_petstore_src/components/cart/src/jonas-ejb-jar.xml similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/cart/src/jonas-ejb-jar.xml rename to jonas/examples/petstore1.3/jonas_petstore_src/components/cart/src/jonas-ejb-jar.xml diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/catalog/src/build.xml b/jonas/examples/petstore1.3/jonas_petstore_src/components/catalog/src/build.xml similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/catalog/src/build.xml rename to jonas/examples/petstore1.3/jonas_petstore_src/components/catalog/src/build.xml diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/catalog/src/ejb-jar.xml b/jonas/examples/petstore1.3/jonas_petstore_src/components/catalog/src/ejb-jar.xml similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/catalog/src/ejb-jar.xml rename to jonas/examples/petstore1.3/jonas_petstore_src/components/catalog/src/ejb-jar.xml diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/catalog/src/jonas-ejb-jar.xml b/jonas/examples/petstore1.3/jonas_petstore_src/components/catalog/src/jonas-ejb-jar.xml similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/catalog/src/jonas-ejb-jar.xml rename to jonas/examples/petstore1.3/jonas_petstore_src/components/catalog/src/jonas-ejb-jar.xml diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/catalog/src/modif.info b/jonas/examples/petstore1.3/jonas_petstore_src/components/catalog/src/modif.info similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/catalog/src/modif.info rename to jonas/examples/petstore1.3/jonas_petstore_src/components/catalog/src/modif.info diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/contactinfo/src/build.xml b/jonas/examples/petstore1.3/jonas_petstore_src/components/contactinfo/src/build.xml similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/contactinfo/src/build.xml rename to jonas/examples/petstore1.3/jonas_petstore_src/components/contactinfo/src/build.xml diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/contactinfo/src/com/sun/j2ee/blueprints/contactinfo/ejb/ContactInfoEJB.java b/jonas/examples/petstore1.3/jonas_petstore_src/components/contactinfo/src/com/sun/j2ee/blueprints/contactinfo/ejb/ContactInfoEJB.java similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/contactinfo/src/com/sun/j2ee/blueprints/contactinfo/ejb/ContactInfoEJB.java rename to jonas/examples/petstore1.3/jonas_petstore_src/components/contactinfo/src/com/sun/j2ee/blueprints/contactinfo/ejb/ContactInfoEJB.java diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/contactinfo/src/ejb-jar.xml b/jonas/examples/petstore1.3/jonas_petstore_src/components/contactinfo/src/ejb-jar.xml similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/contactinfo/src/ejb-jar.xml rename to jonas/examples/petstore1.3/jonas_petstore_src/components/contactinfo/src/ejb-jar.xml diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/contactinfo/src/jonas-ejb-jar.xml b/jonas/examples/petstore1.3/jonas_petstore_src/components/contactinfo/src/jonas-ejb-jar.xml similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/contactinfo/src/jonas-ejb-jar.xml rename to jonas/examples/petstore1.3/jonas_petstore_src/components/contactinfo/src/jonas-ejb-jar.xml diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/creditcard/src/build.xml b/jonas/examples/petstore1.3/jonas_petstore_src/components/creditcard/src/build.xml similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/creditcard/src/build.xml rename to jonas/examples/petstore1.3/jonas_petstore_src/components/creditcard/src/build.xml diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/creditcard/src/com/sun/j2ee/blueprints/creditcard/ejb/CreditCardEJB.java b/jonas/examples/petstore1.3/jonas_petstore_src/components/creditcard/src/com/sun/j2ee/blueprints/creditcard/ejb/CreditCardEJB.java similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/creditcard/src/com/sun/j2ee/blueprints/creditcard/ejb/CreditCardEJB.java rename to jonas/examples/petstore1.3/jonas_petstore_src/components/creditcard/src/com/sun/j2ee/blueprints/creditcard/ejb/CreditCardEJB.java diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/creditcard/src/ejb-jar.xml b/jonas/examples/petstore1.3/jonas_petstore_src/components/creditcard/src/ejb-jar.xml similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/creditcard/src/ejb-jar.xml rename to jonas/examples/petstore1.3/jonas_petstore_src/components/creditcard/src/ejb-jar.xml diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/creditcard/src/jonas-ejb-jar.xml b/jonas/examples/petstore1.3/jonas_petstore_src/components/creditcard/src/jonas-ejb-jar.xml similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/creditcard/src/jonas-ejb-jar.xml rename to jonas/examples/petstore1.3/jonas_petstore_src/components/creditcard/src/jonas-ejb-jar.xml diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/customer/src/build.xml b/jonas/examples/petstore1.3/jonas_petstore_src/components/customer/src/build.xml similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/customer/src/build.xml rename to jonas/examples/petstore1.3/jonas_petstore_src/components/customer/src/build.xml diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/customer/src/com/sun/j2ee/blueprints/customer/account/ejb/AccountEJB.java b/jonas/examples/petstore1.3/jonas_petstore_src/components/customer/src/com/sun/j2ee/blueprints/customer/account/ejb/AccountEJB.java similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/customer/src/com/sun/j2ee/blueprints/customer/account/ejb/AccountEJB.java rename to jonas/examples/petstore1.3/jonas_petstore_src/components/customer/src/com/sun/j2ee/blueprints/customer/account/ejb/AccountEJB.java diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/customer/src/com/sun/j2ee/blueprints/customer/profile/ejb/ProfileEJB.java b/jonas/examples/petstore1.3/jonas_petstore_src/components/customer/src/com/sun/j2ee/blueprints/customer/profile/ejb/ProfileEJB.java similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/customer/src/com/sun/j2ee/blueprints/customer/profile/ejb/ProfileEJB.java rename to jonas/examples/petstore1.3/jonas_petstore_src/components/customer/src/com/sun/j2ee/blueprints/customer/profile/ejb/ProfileEJB.java diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/customer/src/ejb-jar.xml b/jonas/examples/petstore1.3/jonas_petstore_src/components/customer/src/ejb-jar.xml similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/customer/src/ejb-jar.xml rename to jonas/examples/petstore1.3/jonas_petstore_src/components/customer/src/ejb-jar.xml diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/customer/src/jonas-ejb-jar.xml b/jonas/examples/petstore1.3/jonas_petstore_src/components/customer/src/jonas-ejb-jar.xml similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/customer/src/jonas-ejb-jar.xml rename to jonas/examples/petstore1.3/jonas_petstore_src/components/customer/src/jonas-ejb-jar.xml diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/encodingfilter/src/build.xml b/jonas/examples/petstore1.3/jonas_petstore_src/components/encodingfilter/src/build.xml similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/encodingfilter/src/build.xml rename to jonas/examples/petstore1.3/jonas_petstore_src/components/encodingfilter/src/build.xml diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/lineitem/src/build.xml b/jonas/examples/petstore1.3/jonas_petstore_src/components/lineitem/src/build.xml similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/lineitem/src/build.xml rename to jonas/examples/petstore1.3/jonas_petstore_src/components/lineitem/src/build.xml diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/lineitem/src/com/sun/j2ee/blueprints/lineitem/ejb/LineItemEJB.java b/jonas/examples/petstore1.3/jonas_petstore_src/components/lineitem/src/com/sun/j2ee/blueprints/lineitem/ejb/LineItemEJB.java similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/lineitem/src/com/sun/j2ee/blueprints/lineitem/ejb/LineItemEJB.java rename to jonas/examples/petstore1.3/jonas_petstore_src/components/lineitem/src/com/sun/j2ee/blueprints/lineitem/ejb/LineItemEJB.java diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/lineitem/src/ejb-jar.xml b/jonas/examples/petstore1.3/jonas_petstore_src/components/lineitem/src/ejb-jar.xml similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/lineitem/src/ejb-jar.xml rename to jonas/examples/petstore1.3/jonas_petstore_src/components/lineitem/src/ejb-jar.xml diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/lineitem/src/jonas-ejb-jar.xml b/jonas/examples/petstore1.3/jonas_petstore_src/components/lineitem/src/jonas-ejb-jar.xml similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/lineitem/src/jonas-ejb-jar.xml rename to jonas/examples/petstore1.3/jonas_petstore_src/components/lineitem/src/jonas-ejb-jar.xml diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/mailer/src/OPC.xml b/jonas/examples/petstore1.3/jonas_petstore_src/components/mailer/src/OPC.xml similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/mailer/src/OPC.xml rename to jonas/examples/petstore1.3/jonas_petstore_src/components/mailer/src/OPC.xml diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/mailer/src/build.xml b/jonas/examples/petstore1.3/jonas_petstore_src/components/mailer/src/build.xml similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/mailer/src/build.xml rename to jonas/examples/petstore1.3/jonas_petstore_src/components/mailer/src/build.xml diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/mailer/src/jonas-OPC.xml b/jonas/examples/petstore1.3/jonas_petstore_src/components/mailer/src/jonas-OPC.xml similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/mailer/src/jonas-OPC.xml rename to jonas/examples/petstore1.3/jonas_petstore_src/components/mailer/src/jonas-OPC.xml diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/mailer/src/jonas-ejb-jar.xml b/jonas/examples/petstore1.3/jonas_petstore_src/components/mailer/src/jonas-ejb-jar.xml similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/mailer/src/jonas-ejb-jar.xml rename to jonas/examples/petstore1.3/jonas_petstore_src/components/mailer/src/jonas-ejb-jar.xml diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/mailer/src/modif.info b/jonas/examples/petstore1.3/jonas_petstore_src/components/mailer/src/modif.info similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/mailer/src/modif.info rename to jonas/examples/petstore1.3/jonas_petstore_src/components/mailer/src/modif.info diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/processmanager/src/OPC.xml b/jonas/examples/petstore1.3/jonas_petstore_src/components/processmanager/src/OPC.xml similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/processmanager/src/OPC.xml rename to jonas/examples/petstore1.3/jonas_petstore_src/components/processmanager/src/OPC.xml diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/processmanager/src/build.xml b/jonas/examples/petstore1.3/jonas_petstore_src/components/processmanager/src/build.xml similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/processmanager/src/build.xml rename to jonas/examples/petstore1.3/jonas_petstore_src/components/processmanager/src/build.xml diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/processmanager/src/jonas-OPC.xml b/jonas/examples/petstore1.3/jonas_petstore_src/components/processmanager/src/jonas-OPC.xml similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/processmanager/src/jonas-OPC.xml rename to jonas/examples/petstore1.3/jonas_petstore_src/components/processmanager/src/jonas-OPC.xml diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/processmanager/src/jonas-ejb-jar.xml b/jonas/examples/petstore1.3/jonas_petstore_src/components/processmanager/src/jonas-ejb-jar.xml similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/processmanager/src/jonas-ejb-jar.xml rename to jonas/examples/petstore1.3/jonas_petstore_src/components/processmanager/src/jonas-ejb-jar.xml diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/processmanager/src/modif.info b/jonas/examples/petstore1.3/jonas_petstore_src/components/processmanager/src/modif.info similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/processmanager/src/modif.info rename to jonas/examples/petstore1.3/jonas_petstore_src/components/processmanager/src/modif.info diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/purchaseorder/src/OPC.xml b/jonas/examples/petstore1.3/jonas_petstore_src/components/purchaseorder/src/OPC.xml similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/purchaseorder/src/OPC.xml rename to jonas/examples/petstore1.3/jonas_petstore_src/components/purchaseorder/src/OPC.xml diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/purchaseorder/src/build.xml b/jonas/examples/petstore1.3/jonas_petstore_src/components/purchaseorder/src/build.xml similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/purchaseorder/src/build.xml rename to jonas/examples/petstore1.3/jonas_petstore_src/components/purchaseorder/src/build.xml diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/purchaseorder/src/ejb-jar.xml b/jonas/examples/petstore1.3/jonas_petstore_src/components/purchaseorder/src/ejb-jar.xml similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/purchaseorder/src/ejb-jar.xml rename to jonas/examples/petstore1.3/jonas_petstore_src/components/purchaseorder/src/ejb-jar.xml diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/purchaseorder/src/jonas-OPC.xml b/jonas/examples/petstore1.3/jonas_petstore_src/components/purchaseorder/src/jonas-OPC.xml similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/purchaseorder/src/jonas-OPC.xml rename to jonas/examples/petstore1.3/jonas_petstore_src/components/purchaseorder/src/jonas-OPC.xml diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/purchaseorder/src/jonas-ejb-jar.xml b/jonas/examples/petstore1.3/jonas_petstore_src/components/purchaseorder/src/jonas-ejb-jar.xml similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/purchaseorder/src/jonas-ejb-jar.xml rename to jonas/examples/petstore1.3/jonas_petstore_src/components/purchaseorder/src/jonas-ejb-jar.xml diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/purchaseorder/src/modif.info b/jonas/examples/petstore1.3/jonas_petstore_src/components/purchaseorder/src/modif.info similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/purchaseorder/src/modif.info rename to jonas/examples/petstore1.3/jonas_petstore_src/components/purchaseorder/src/modif.info diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/servicelocator/src/build.xml b/jonas/examples/petstore1.3/jonas_petstore_src/components/servicelocator/src/build.xml similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/servicelocator/src/build.xml rename to jonas/examples/petstore1.3/jonas_petstore_src/components/servicelocator/src/build.xml diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/signon/src/build.xml b/jonas/examples/petstore1.3/jonas_petstore_src/components/signon/src/build.xml similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/signon/src/build.xml rename to jonas/examples/petstore1.3/jonas_petstore_src/components/signon/src/build.xml diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/signon/src/jonas-ejb-jar.xml b/jonas/examples/petstore1.3/jonas_petstore_src/components/signon/src/jonas-ejb-jar.xml similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/signon/src/jonas-ejb-jar.xml rename to jonas/examples/petstore1.3/jonas_petstore_src/components/signon/src/jonas-ejb-jar.xml diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/supplierpo/src/build.xml b/jonas/examples/petstore1.3/jonas_petstore_src/components/supplierpo/src/build.xml similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/supplierpo/src/build.xml rename to jonas/examples/petstore1.3/jonas_petstore_src/components/supplierpo/src/build.xml diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/supplierpo/src/ejb-jar.xml b/jonas/examples/petstore1.3/jonas_petstore_src/components/supplierpo/src/ejb-jar.xml similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/supplierpo/src/ejb-jar.xml rename to jonas/examples/petstore1.3/jonas_petstore_src/components/supplierpo/src/ejb-jar.xml diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/supplierpo/src/jonas-ejb-jar.xml b/jonas/examples/petstore1.3/jonas_petstore_src/components/supplierpo/src/jonas-ejb-jar.xml similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/supplierpo/src/jonas-ejb-jar.xml rename to jonas/examples/petstore1.3/jonas_petstore_src/components/supplierpo/src/jonas-ejb-jar.xml diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/uidgen/src/build.xml b/jonas/examples/petstore1.3/jonas_petstore_src/components/uidgen/src/build.xml similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/uidgen/src/build.xml rename to jonas/examples/petstore1.3/jonas_petstore_src/components/uidgen/src/build.xml diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/uidgen/src/jonas-ejb-jar.xml b/jonas/examples/petstore1.3/jonas_petstore_src/components/uidgen/src/jonas-ejb-jar.xml similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/uidgen/src/jonas-ejb-jar.xml rename to jonas/examples/petstore1.3/jonas_petstore_src/components/uidgen/src/jonas-ejb-jar.xml diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/util/tracer/src/build.xml b/jonas/examples/petstore1.3/jonas_petstore_src/components/util/tracer/src/build.xml similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/util/tracer/src/build.xml rename to jonas/examples/petstore1.3/jonas_petstore_src/components/util/tracer/src/build.xml diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/xmldocuments/src/build.xml b/jonas/examples/petstore1.3/jonas_petstore_src/components/xmldocuments/src/build.xml similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/components/xmldocuments/src/build.xml rename to jonas/examples/petstore1.3/jonas_petstore_src/components/xmldocuments/src/build.xml diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/waf/src/application.xml b/jonas/examples/petstore1.3/jonas_petstore_src/waf/src/application.xml similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/waf/src/application.xml rename to jonas/examples/petstore1.3/jonas_petstore_src/waf/src/application.xml diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/waf/src/build.bat b/jonas/examples/petstore1.3/jonas_petstore_src/waf/src/build.bat similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/waf/src/build.bat rename to jonas/examples/petstore1.3/jonas_petstore_src/waf/src/build.bat diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/waf/src/build.sh b/jonas/examples/petstore1.3/jonas_petstore_src/waf/src/build.sh similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/waf/src/build.sh rename to jonas/examples/petstore1.3/jonas_petstore_src/waf/src/build.sh diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/waf/src/build.xml b/jonas/examples/petstore1.3/jonas_petstore_src/waf/src/build.xml similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/waf/src/build.xml rename to jonas/examples/petstore1.3/jonas_petstore_src/waf/src/build.xml diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/waf/src/docroot/WEB-INF/modif.info b/jonas/examples/petstore1.3/jonas_petstore_src/waf/src/docroot/WEB-INF/modif.info similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/waf/src/docroot/WEB-INF/modif.info rename to jonas/examples/petstore1.3/jonas_petstore_src/waf/src/docroot/WEB-INF/modif.info diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/waf/src/docroot/WEB-INF/web.xml b/jonas/examples/petstore1.3/jonas_petstore_src/waf/src/docroot/WEB-INF/web.xml similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/waf/src/docroot/WEB-INF/web.xml rename to jonas/examples/petstore1.3/jonas_petstore_src/waf/src/docroot/WEB-INF/web.xml diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/waf/src/jonas-ejb-jar.xml b/jonas/examples/petstore1.3/jonas_petstore_src/waf/src/jonas-ejb-jar.xml similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/waf/src/jonas-ejb-jar.xml rename to jonas/examples/petstore1.3/jonas_petstore_src/waf/src/jonas-ejb-jar.xml diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/waf/src/waf_ejbruntime.xml b/jonas/examples/petstore1.3/jonas_petstore_src/waf/src/waf_ejbruntime.xml similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/waf/src/waf_ejbruntime.xml rename to jonas/examples/petstore1.3/jonas_petstore_src/waf/src/waf_ejbruntime.xml diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/waf/src/waf_warruntime.xml b/jonas/examples/petstore1.3/jonas_petstore_src/waf/src/waf_warruntime.xml similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/waf/src/waf_warruntime.xml rename to jonas/examples/petstore1.3/jonas_petstore_src/waf/src/waf_warruntime.xml diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/README b/jonas/examples/petstore1.3/jonas_petstore_src/webservices/README similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/README rename to jonas/examples/petstore1.3/jonas_petstore_src/webservices/README diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/admin/src/AdminWebService.wsdl b/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/admin/src/AdminWebService.wsdl similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/admin/src/AdminWebService.wsdl rename to jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/admin/src/AdminWebService.wsdl diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/admin/src/adminwsclient.bat b/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/admin/src/adminwsclient.bat similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/admin/src/adminwsclient.bat rename to jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/admin/src/adminwsclient.bat diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/admin/src/adminwsclient.sh b/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/admin/src/adminwsclient.sh similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/admin/src/adminwsclient.sh rename to jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/admin/src/adminwsclient.sh diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/admin/src/build.bat b/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/admin/src/build.bat similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/admin/src/build.bat rename to jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/admin/src/build.bat diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/admin/src/build.sh b/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/admin/src/build.sh similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/admin/src/build.sh rename to jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/admin/src/build.sh diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/admin/src/build.xml b/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/admin/src/build.xml similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/admin/src/build.xml rename to jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/admin/src/build.xml diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/admin/src/client/com/sun/j2ee/blueprints/admin/client/WebServicePetStoreProxy.java b/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/admin/src/client/com/sun/j2ee/blueprints/admin/client/WebServicePetStoreProxy.java similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/admin/src/client/com/sun/j2ee/blueprints/admin/client/WebServicePetStoreProxy.java rename to jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/admin/src/client/com/sun/j2ee/blueprints/admin/client/WebServicePetStoreProxy.java diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/admin/src/client/com/sun/j2ee/blueprints/admin/client/modif.info b/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/admin/src/client/com/sun/j2ee/blueprints/admin/client/modif.info similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/admin/src/client/com/sun/j2ee/blueprints/admin/client/modif.info rename to jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/admin/src/client/com/sun/j2ee/blueprints/admin/client/modif.info diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/admin/src/client/com/sun/j2ee/blueprints/admin/webservice/AdminServiceImpl.java b/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/admin/src/client/com/sun/j2ee/blueprints/admin/webservice/AdminServiceImpl.java similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/admin/src/client/com/sun/j2ee/blueprints/admin/webservice/AdminServiceImpl.java rename to jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/admin/src/client/com/sun/j2ee/blueprints/admin/webservice/AdminServiceImpl.java diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/admin/src/client/com/sun/j2ee/blueprints/admin/webservice/AdminServiceImplService.java b/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/admin/src/client/com/sun/j2ee/blueprints/admin/webservice/AdminServiceImplService.java similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/admin/src/client/com/sun/j2ee/blueprints/admin/webservice/AdminServiceImplService.java rename to jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/admin/src/client/com/sun/j2ee/blueprints/admin/webservice/AdminServiceImplService.java diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/admin/src/client/com/sun/j2ee/blueprints/admin/webservice/AdminServiceImplServiceLocator.java b/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/admin/src/client/com/sun/j2ee/blueprints/admin/webservice/AdminServiceImplServiceLocator.java similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/admin/src/client/com/sun/j2ee/blueprints/admin/webservice/AdminServiceImplServiceLocator.java rename to jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/admin/src/client/com/sun/j2ee/blueprints/admin/webservice/AdminServiceImplServiceLocator.java diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/admin/src/client/com/sun/j2ee/blueprints/admin/webservice/AdminService_Order.java b/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/admin/src/client/com/sun/j2ee/blueprints/admin/webservice/AdminService_Order.java similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/admin/src/client/com/sun/j2ee/blueprints/admin/webservice/AdminService_Order.java rename to jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/admin/src/client/com/sun/j2ee/blueprints/admin/webservice/AdminService_Order.java diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/admin/src/client/com/sun/j2ee/blueprints/admin/webservice/AdminService_OrderApprovalTO.java b/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/admin/src/client/com/sun/j2ee/blueprints/admin/webservice/AdminService_OrderApprovalTO.java similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/admin/src/client/com/sun/j2ee/blueprints/admin/webservice/AdminService_OrderApprovalTO.java rename to jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/admin/src/client/com/sun/j2ee/blueprints/admin/webservice/AdminService_OrderApprovalTO.java diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/admin/src/client/com/sun/j2ee/blueprints/admin/webservice/AdminService_OrdersTO.java b/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/admin/src/client/com/sun/j2ee/blueprints/admin/webservice/AdminService_OrdersTO.java similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/admin/src/client/com/sun/j2ee/blueprints/admin/webservice/AdminService_OrdersTO.java rename to jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/admin/src/client/com/sun/j2ee/blueprints/admin/webservice/AdminService_OrdersTO.java diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/admin/src/client/com/sun/j2ee/blueprints/admin/webservice/AdminWebServiceSoapBindingStub.java b/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/admin/src/client/com/sun/j2ee/blueprints/admin/webservice/AdminWebServiceSoapBindingStub.java similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/admin/src/client/com/sun/j2ee/blueprints/admin/webservice/AdminWebServiceSoapBindingStub.java rename to jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/admin/src/client/com/sun/j2ee/blueprints/admin/webservice/AdminWebServiceSoapBindingStub.java diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/admin/src/client/com/sun/j2ee/blueprints/admin/webservice/modif.info b/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/admin/src/client/com/sun/j2ee/blueprints/admin/webservice/modif.info similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/admin/src/client/com/sun/j2ee/blueprints/admin/webservice/modif.info rename to jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/admin/src/client/com/sun/j2ee/blueprints/admin/webservice/modif.info diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/admin/src/deploy.wsdd b/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/admin/src/deploy.wsdd similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/admin/src/deploy.wsdd rename to jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/admin/src/deploy.wsdd diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/admin/src/docroot/WEB-INF/modif.info b/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/admin/src/docroot/WEB-INF/modif.info similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/admin/src/docroot/WEB-INF/modif.info rename to jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/admin/src/docroot/WEB-INF/modif.info diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/admin/src/docroot/WEB-INF/web.xml b/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/admin/src/docroot/WEB-INF/web.xml similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/admin/src/docroot/WEB-INF/web.xml rename to jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/admin/src/docroot/WEB-INF/web.xml diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/admin/src/server-config.wsdd b/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/admin/src/server-config.wsdd similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/admin/src/server-config.wsdd rename to jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/admin/src/server-config.wsdd diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/admin/src/undeploy.wsdd b/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/admin/src/undeploy.wsdd similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/admin/src/undeploy.wsdd rename to jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/admin/src/undeploy.wsdd diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/build.bat b/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/build.bat similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/build.bat rename to jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/build.bat diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/build.sh b/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/build.sh similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/build.sh rename to jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/build.sh diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/build.xml b/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/build.xml similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/build.xml rename to jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/build.xml diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/SupplierWebService.wsdl b/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/SupplierWebService.wsdl similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/SupplierWebService.wsdl rename to jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/SupplierWebService.wsdl diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/build.bat b/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/build.bat similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/build.bat rename to jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/build.bat diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/build.sh b/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/build.sh similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/build.sh rename to jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/build.sh diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/build.xml b/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/build.xml similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/build.xml rename to jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/build.xml diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/com/sun/j2ee/blueprints/opc/webservice/invoicercvr/TopicHelper.java b/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/com/sun/j2ee/blueprints/opc/webservice/invoicercvr/TopicHelper.java similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/com/sun/j2ee/blueprints/opc/webservice/invoicercvr/TopicHelper.java rename to jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/com/sun/j2ee/blueprints/opc/webservice/invoicercvr/TopicHelper.java diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/com/sun/j2ee/blueprints/opc/webservice/invoicercvr/modif.info b/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/com/sun/j2ee/blueprints/opc/webservice/invoicercvr/modif.info similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/com/sun/j2ee/blueprints/opc/webservice/invoicercvr/modif.info rename to jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/com/sun/j2ee/blueprints/opc/webservice/invoicercvr/modif.info diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/com/sun/j2ee/blueprints/opc/webservice/posender/SupplierOrderSender.java b/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/com/sun/j2ee/blueprints/opc/webservice/posender/SupplierOrderSender.java similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/com/sun/j2ee/blueprints/opc/webservice/posender/SupplierOrderSender.java rename to jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/com/sun/j2ee/blueprints/opc/webservice/posender/SupplierOrderSender.java diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/com/sun/j2ee/blueprints/opc/webservice/posender/modif.info b/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/com/sun/j2ee/blueprints/opc/webservice/posender/modif.info similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/com/sun/j2ee/blueprints/opc/webservice/posender/modif.info rename to jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/com/sun/j2ee/blueprints/opc/webservice/posender/modif.info diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/com/sun/j2ee/blueprints/opc/webservice/supplierclient/InvalidOrderException.java b/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/com/sun/j2ee/blueprints/opc/webservice/supplierclient/InvalidOrderException.java similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/com/sun/j2ee/blueprints/opc/webservice/supplierclient/InvalidOrderException.java rename to jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/com/sun/j2ee/blueprints/opc/webservice/supplierclient/InvalidOrderException.java diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/com/sun/j2ee/blueprints/opc/webservice/supplierclient/SupplierServiceImpl.java b/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/com/sun/j2ee/blueprints/opc/webservice/supplierclient/SupplierServiceImpl.java similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/com/sun/j2ee/blueprints/opc/webservice/supplierclient/SupplierServiceImpl.java rename to jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/com/sun/j2ee/blueprints/opc/webservice/supplierclient/SupplierServiceImpl.java diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/com/sun/j2ee/blueprints/opc/webservice/supplierclient/SupplierServiceImplService.java b/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/com/sun/j2ee/blueprints/opc/webservice/supplierclient/SupplierServiceImplService.java similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/com/sun/j2ee/blueprints/opc/webservice/supplierclient/SupplierServiceImplService.java rename to jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/com/sun/j2ee/blueprints/opc/webservice/supplierclient/SupplierServiceImplService.java diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/com/sun/j2ee/blueprints/opc/webservice/supplierclient/SupplierServiceImplServiceLocator.java b/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/com/sun/j2ee/blueprints/opc/webservice/supplierclient/SupplierServiceImplServiceLocator.java similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/com/sun/j2ee/blueprints/opc/webservice/supplierclient/SupplierServiceImplServiceLocator.java rename to jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/com/sun/j2ee/blueprints/opc/webservice/supplierclient/SupplierServiceImplServiceLocator.java diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/com/sun/j2ee/blueprints/opc/webservice/supplierclient/SupplierWebServiceSoapBindingStub.java b/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/com/sun/j2ee/blueprints/opc/webservice/supplierclient/SupplierWebServiceSoapBindingStub.java similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/com/sun/j2ee/blueprints/opc/webservice/supplierclient/SupplierWebServiceSoapBindingStub.java rename to jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/com/sun/j2ee/blueprints/opc/webservice/supplierclient/SupplierWebServiceSoapBindingStub.java diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/com/sun/j2ee/blueprints/opc/webservice/supplierclient/UnknownOrderIdException.java b/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/com/sun/j2ee/blueprints/opc/webservice/supplierclient/UnknownOrderIdException.java similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/com/sun/j2ee/blueprints/opc/webservice/supplierclient/UnknownOrderIdException.java rename to jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/com/sun/j2ee/blueprints/opc/webservice/supplierclient/UnknownOrderIdException.java diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/com/sun/j2ee/blueprints/opc/webservice/supplierclient/modif.info b/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/com/sun/j2ee/blueprints/opc/webservice/supplierclient/modif.info similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/com/sun/j2ee/blueprints/opc/webservice/supplierclient/modif.info rename to jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/com/sun/j2ee/blueprints/opc/webservice/supplierclient/modif.info diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/deploy.wsdd b/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/deploy.wsdd similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/deploy.wsdd rename to jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/deploy.wsdd diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/docroot/WEB-INF/jonas-web.xml b/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/docroot/WEB-INF/jonas-web.xml similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/docroot/WEB-INF/jonas-web.xml rename to jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/docroot/WEB-INF/jonas-web.xml diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/docroot/WEB-INF/modif.info b/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/docroot/WEB-INF/modif.info similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/docroot/WEB-INF/modif.info rename to jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/docroot/WEB-INF/modif.info diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/docroot/WEB-INF/web.xml b/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/docroot/WEB-INF/web.xml similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/docroot/WEB-INF/web.xml rename to jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/docroot/WEB-INF/web.xml diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/ejb-jar.xml b/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/ejb-jar.xml similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/ejb-jar.xml rename to jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/ejb-jar.xml diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/jonas-ejb-jar.xml b/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/jonas-ejb-jar.xml similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/jonas-ejb-jar.xml rename to jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/jonas-ejb-jar.xml diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/modif.info b/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/modif.info similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/modif.info rename to jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/modif.info diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/server-config.wsdd b/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/server-config.wsdd similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/server-config.wsdd rename to jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/server-config.wsdd diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/undeploy.wsdd b/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/undeploy.wsdd similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/undeploy.wsdd rename to jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/opc/src/undeploy.wsdd diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/petstore/src/build.bat b/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/petstore/src/build.bat similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/petstore/src/build.bat rename to jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/petstore/src/build.bat diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/petstore/src/build.sh b/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/petstore/src/build.sh similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/petstore/src/build.sh rename to jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/petstore/src/build.sh diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/petstore/src/build.xml b/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/petstore/src/build.xml similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/petstore/src/build.xml rename to jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/petstore/src/build.xml diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/supplier/src/OPCWebService.wsdl b/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/supplier/src/OPCWebService.wsdl similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/supplier/src/OPCWebService.wsdl rename to jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/supplier/src/OPCWebService.wsdl diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/supplier/src/build.bat b/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/supplier/src/build.bat similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/supplier/src/build.bat rename to jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/supplier/src/build.bat diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/supplier/src/build.sh b/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/supplier/src/build.sh similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/supplier/src/build.sh rename to jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/supplier/src/build.sh diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/supplier/src/build.xml b/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/supplier/src/build.xml similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/supplier/src/build.xml rename to jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/supplier/src/build.xml diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/supplier/src/com/sun/j2ee/blueprints/supplier/webservice/invoicesender/InvoiceSender.java b/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/supplier/src/com/sun/j2ee/blueprints/supplier/webservice/invoicesender/InvoiceSender.java similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/supplier/src/com/sun/j2ee/blueprints/supplier/webservice/invoicesender/InvoiceSender.java rename to jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/supplier/src/com/sun/j2ee/blueprints/supplier/webservice/invoicesender/InvoiceSender.java diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/supplier/src/com/sun/j2ee/blueprints/supplier/webservice/invoicesender/modif.info b/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/supplier/src/com/sun/j2ee/blueprints/supplier/webservice/invoicesender/modif.info similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/supplier/src/com/sun/j2ee/blueprints/supplier/webservice/invoicesender/modif.info rename to jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/supplier/src/com/sun/j2ee/blueprints/supplier/webservice/invoicesender/modif.info diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/supplier/src/com/sun/j2ee/blueprints/supplier/webservice/opcclient/InvalidInvoiceException.java b/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/supplier/src/com/sun/j2ee/blueprints/supplier/webservice/opcclient/InvalidInvoiceException.java similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/supplier/src/com/sun/j2ee/blueprints/supplier/webservice/opcclient/InvalidInvoiceException.java rename to jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/supplier/src/com/sun/j2ee/blueprints/supplier/webservice/opcclient/InvalidInvoiceException.java diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/supplier/src/com/sun/j2ee/blueprints/supplier/webservice/opcclient/OPCServiceImpl.java b/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/supplier/src/com/sun/j2ee/blueprints/supplier/webservice/opcclient/OPCServiceImpl.java similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/supplier/src/com/sun/j2ee/blueprints/supplier/webservice/opcclient/OPCServiceImpl.java rename to jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/supplier/src/com/sun/j2ee/blueprints/supplier/webservice/opcclient/OPCServiceImpl.java diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/supplier/src/com/sun/j2ee/blueprints/supplier/webservice/opcclient/OPCServiceImplService.java b/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/supplier/src/com/sun/j2ee/blueprints/supplier/webservice/opcclient/OPCServiceImplService.java similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/supplier/src/com/sun/j2ee/blueprints/supplier/webservice/opcclient/OPCServiceImplService.java rename to jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/supplier/src/com/sun/j2ee/blueprints/supplier/webservice/opcclient/OPCServiceImplService.java diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/supplier/src/com/sun/j2ee/blueprints/supplier/webservice/opcclient/OPCServiceImplServiceLocator.java b/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/supplier/src/com/sun/j2ee/blueprints/supplier/webservice/opcclient/OPCServiceImplServiceLocator.java similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/supplier/src/com/sun/j2ee/blueprints/supplier/webservice/opcclient/OPCServiceImplServiceLocator.java rename to jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/supplier/src/com/sun/j2ee/blueprints/supplier/webservice/opcclient/OPCServiceImplServiceLocator.java diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/supplier/src/com/sun/j2ee/blueprints/supplier/webservice/opcclient/OPCWebServiceSoapBindingStub.java b/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/supplier/src/com/sun/j2ee/blueprints/supplier/webservice/opcclient/OPCWebServiceSoapBindingStub.java similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/supplier/src/com/sun/j2ee/blueprints/supplier/webservice/opcclient/OPCWebServiceSoapBindingStub.java rename to jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/supplier/src/com/sun/j2ee/blueprints/supplier/webservice/opcclient/OPCWebServiceSoapBindingStub.java diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/supplier/src/com/sun/j2ee/blueprints/supplier/webservice/opcclient/modif.info b/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/supplier/src/com/sun/j2ee/blueprints/supplier/webservice/opcclient/modif.info similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/supplier/src/com/sun/j2ee/blueprints/supplier/webservice/opcclient/modif.info rename to jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/supplier/src/com/sun/j2ee/blueprints/supplier/webservice/opcclient/modif.info diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/supplier/src/deploy.wsdd b/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/supplier/src/deploy.wsdd similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/supplier/src/deploy.wsdd rename to jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/supplier/src/deploy.wsdd diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/supplier/src/docroot/WEB-INF/jonas-web.xml b/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/supplier/src/docroot/WEB-INF/jonas-web.xml similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/supplier/src/docroot/WEB-INF/jonas-web.xml rename to jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/supplier/src/docroot/WEB-INF/jonas-web.xml diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/supplier/src/docroot/WEB-INF/modif.info b/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/supplier/src/docroot/WEB-INF/modif.info similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/supplier/src/docroot/WEB-INF/modif.info rename to jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/supplier/src/docroot/WEB-INF/modif.info diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/supplier/src/docroot/WEB-INF/web.xml b/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/supplier/src/docroot/WEB-INF/web.xml similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/supplier/src/docroot/WEB-INF/web.xml rename to jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/supplier/src/docroot/WEB-INF/web.xml diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/supplier/src/ejb-jar.xml b/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/supplier/src/ejb-jar.xml similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/supplier/src/ejb-jar.xml rename to jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/supplier/src/ejb-jar.xml diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/supplier/src/jonas-ejb-jar.xml b/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/supplier/src/jonas-ejb-jar.xml similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/supplier/src/jonas-ejb-jar.xml rename to jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/supplier/src/jonas-ejb-jar.xml diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/supplier/src/modif.info b/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/supplier/src/modif.info similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/supplier/src/modif.info rename to jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/supplier/src/modif.info diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/supplier/src/server-config.wsdd b/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/supplier/src/server-config.wsdd similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/supplier/src/server-config.wsdd rename to jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/supplier/src/server-config.wsdd diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/supplier/src/undeploy.wsdd b/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/supplier/src/undeploy.wsdd similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/supplier/src/undeploy.wsdd rename to jonas/examples/petstore1.3/jonas_petstore_src/webservices/apps/supplier/src/undeploy.wsdd diff --git a/jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/build.xml b/jonas/examples/petstore1.3/jonas_petstore_src/webservices/build.xml similarity index 100% rename from jonas/jonas/examples/petstore1.3/jonas_petstore_src/webservices/build.xml rename to jonas/examples/petstore1.3/jonas_petstore_src/webservices/build.xml diff --git a/jonas/jonas/examples/sampleCluster2/.classpath b/jonas/examples/sampleCluster2/.classpath similarity index 100% rename from jonas/jonas/examples/sampleCluster2/.classpath rename to jonas/examples/sampleCluster2/.classpath diff --git a/jonas/jonas/examples/sampleCluster2/.project b/jonas/examples/sampleCluster2/.project similarity index 100% rename from jonas/jonas/examples/sampleCluster2/.project rename to jonas/examples/sampleCluster2/.project diff --git a/jonas/jonas/examples/sampleCluster2/PortConfiguration.txt b/jonas/examples/sampleCluster2/PortConfiguration.txt similarity index 100% rename from jonas/jonas/examples/sampleCluster2/PortConfiguration.txt rename to jonas/examples/sampleCluster2/PortConfiguration.txt diff --git a/jonas/jonas/examples/sampleCluster2/README b/jonas/examples/sampleCluster2/README similarity index 100% rename from jonas/jonas/examples/sampleCluster2/README rename to jonas/examples/sampleCluster2/README diff --git a/jonas/jonas/examples/sampleCluster2/build.properties b/jonas/examples/sampleCluster2/build.properties similarity index 100% rename from jonas/jonas/examples/sampleCluster2/build.properties rename to jonas/examples/sampleCluster2/build.properties diff --git a/jonas/jonas/examples/sampleCluster2/build.xml b/jonas/examples/sampleCluster2/build.xml similarity index 100% rename from jonas/jonas/examples/sampleCluster2/build.xml rename to jonas/examples/sampleCluster2/build.xml diff --git a/jonas/jonas/examples/sampleCluster2/exampleConfig/enhydra_director.conf b/jonas/examples/sampleCluster2/exampleConfig/enhydra_director.conf similarity index 100% rename from jonas/jonas/examples/sampleCluster2/exampleConfig/enhydra_director.conf rename to jonas/examples/sampleCluster2/exampleConfig/enhydra_director.conf diff --git a/jonas/jonas/examples/sampleCluster2/exampleConfig/server-5.0_director.xml b/jonas/examples/sampleCluster2/exampleConfig/server-5.0_director.xml similarity index 100% rename from jonas/jonas/examples/sampleCluster2/exampleConfig/server-5.0_director.xml rename to jonas/examples/sampleCluster2/exampleConfig/server-5.0_director.xml diff --git a/jonas/jonas/examples/sampleCluster2/exampleConfig/server-5.0_mod_jk.xml b/jonas/examples/sampleCluster2/exampleConfig/server-5.0_mod_jk.xml similarity index 100% rename from jonas/jonas/examples/sampleCluster2/exampleConfig/server-5.0_mod_jk.xml rename to jonas/examples/sampleCluster2/exampleConfig/server-5.0_mod_jk.xml diff --git a/jonas/jonas/examples/sampleCluster2/exampleConfig/server-5.5_director.xml b/jonas/examples/sampleCluster2/exampleConfig/server-5.5_director.xml similarity index 100% rename from jonas/jonas/examples/sampleCluster2/exampleConfig/server-5.5_director.xml rename to jonas/examples/sampleCluster2/exampleConfig/server-5.5_director.xml diff --git a/jonas/jonas/examples/sampleCluster2/exampleConfig/server-5.5_mod_jk.xml b/jonas/examples/sampleCluster2/exampleConfig/server-5.5_mod_jk.xml similarity index 100% rename from jonas/jonas/examples/sampleCluster2/exampleConfig/server-5.5_mod_jk.xml rename to jonas/examples/sampleCluster2/exampleConfig/server-5.5_mod_jk.xml diff --git a/jonas/jonas/examples/sampleCluster2/exampleConfig/tomcat_jk.conf b/jonas/examples/sampleCluster2/exampleConfig/tomcat_jk.conf similarity index 100% rename from jonas/jonas/examples/sampleCluster2/exampleConfig/tomcat_jk.conf rename to jonas/examples/sampleCluster2/exampleConfig/tomcat_jk.conf diff --git a/jonas/jonas/examples/sampleCluster2/exampleConfig/workers.properties b/jonas/examples/sampleCluster2/exampleConfig/workers.properties similarity index 100% rename from jonas/jonas/examples/sampleCluster2/exampleConfig/workers.properties rename to jonas/examples/sampleCluster2/exampleConfig/workers.properties diff --git a/jonas/jonas/examples/sampleCluster2/newjc/build-db.properties b/jonas/examples/sampleCluster2/newjc/build-db.properties similarity index 100% rename from jonas/jonas/examples/sampleCluster2/newjc/build-db.properties rename to jonas/examples/sampleCluster2/newjc/build-db.properties diff --git a/jonas/jonas/examples/sampleCluster2/newjc/build-jc.properties b/jonas/examples/sampleCluster2/newjc/build-jc.properties similarity index 100% rename from jonas/jonas/examples/sampleCluster2/newjc/build-jc.properties rename to jonas/examples/sampleCluster2/newjc/build-jc.properties diff --git a/jonas/jonas/examples/sampleCluster2/newjc/build-jc.xml b/jonas/examples/sampleCluster2/newjc/build-jc.xml similarity index 100% rename from jonas/jonas/examples/sampleCluster2/newjc/build-jc.xml rename to jonas/examples/sampleCluster2/newjc/build-jc.xml diff --git a/jonas/jonas/examples/sampleCluster2/newjc/build-master.properties b/jonas/examples/sampleCluster2/newjc/build-master.properties similarity index 100% rename from jonas/jonas/examples/sampleCluster2/newjc/build-master.properties rename to jonas/examples/sampleCluster2/newjc/build-master.properties diff --git a/jonas/jonas/examples/sampleCluster2/newjc/newjc.cmd b/jonas/examples/sampleCluster2/newjc/newjc.cmd similarity index 100% rename from jonas/jonas/examples/sampleCluster2/newjc/newjc.cmd rename to jonas/examples/sampleCluster2/newjc/newjc.cmd diff --git a/jonas/jonas/examples/sampleCluster2/newjc/newjc.sh b/jonas/examples/sampleCluster2/newjc/newjc.sh similarity index 100% rename from jonas/jonas/examples/sampleCluster2/newjc/newjc.sh rename to jonas/examples/sampleCluster2/newjc/newjc.sh diff --git a/jonas/jonas/examples/sampleCluster2/scripts/jcl.bat b/jonas/examples/sampleCluster2/scripts/jcl.bat similarity index 100% rename from jonas/jonas/examples/sampleCluster2/scripts/jcl.bat rename to jonas/examples/sampleCluster2/scripts/jcl.bat diff --git a/jonas/jonas/examples/sampleCluster2/scripts/jcl.sh b/jonas/examples/sampleCluster2/scripts/jcl.sh similarity index 100% rename from jonas/jonas/examples/sampleCluster2/scripts/jcl.sh rename to jonas/examples/sampleCluster2/scripts/jcl.sh diff --git a/jonas/jonas/examples/sampleCluster2/src/application.xml b/jonas/examples/sampleCluster2/src/application.xml similarity index 100% rename from jonas/jonas/examples/sampleCluster2/src/application.xml rename to jonas/examples/sampleCluster2/src/application.xml diff --git a/jonas/jonas/examples/sampleCluster2/src/applicationHA.xml b/jonas/examples/sampleCluster2/src/applicationHA.xml similarity index 100% rename from jonas/jonas/examples/sampleCluster2/src/applicationHA.xml rename to jonas/examples/sampleCluster2/src/applicationHA.xml diff --git a/jonas/jonas/examples/sampleCluster2/src/beans/etc/ejb-jar.xml b/jonas/examples/sampleCluster2/src/beans/etc/ejb-jar.xml similarity index 100% rename from jonas/jonas/examples/sampleCluster2/src/beans/etc/ejb-jar.xml rename to jonas/examples/sampleCluster2/src/beans/etc/ejb-jar.xml diff --git a/jonas/jonas/examples/sampleCluster2/src/beans/etc/jonas-ejb-jar.ha.xml b/jonas/examples/sampleCluster2/src/beans/etc/jonas-ejb-jar.ha.xml similarity index 100% rename from jonas/jonas/examples/sampleCluster2/src/beans/etc/jonas-ejb-jar.ha.xml rename to jonas/examples/sampleCluster2/src/beans/etc/jonas-ejb-jar.ha.xml diff --git a/jonas/jonas/examples/sampleCluster2/src/beans/etc/jonas-ejb-jar.lb.xml b/jonas/examples/sampleCluster2/src/beans/etc/jonas-ejb-jar.lb.xml similarity index 100% rename from jonas/jonas/examples/sampleCluster2/src/beans/etc/jonas-ejb-jar.lb.xml rename to jonas/examples/sampleCluster2/src/beans/etc/jonas-ejb-jar.lb.xml diff --git a/jonas/jonas/examples/sampleCluster2/src/beans/org/objectweb/haTransactions/ejb-jar.xml b/jonas/examples/sampleCluster2/src/beans/org/objectweb/haTransactions/ejb-jar.xml similarity index 100% rename from jonas/jonas/examples/sampleCluster2/src/beans/org/objectweb/haTransactions/ejb-jar.xml rename to jonas/examples/sampleCluster2/src/beans/org/objectweb/haTransactions/ejb-jar.xml diff --git a/jonas/jonas/examples/sampleCluster2/src/beans/org/objectweb/haTransactions/ejb/HaTransactionHome.java b/jonas/examples/sampleCluster2/src/beans/org/objectweb/haTransactions/ejb/HaTransactionHome.java similarity index 100% rename from jonas/jonas/examples/sampleCluster2/src/beans/org/objectweb/haTransactions/ejb/HaTransactionHome.java rename to jonas/examples/sampleCluster2/src/beans/org/objectweb/haTransactions/ejb/HaTransactionHome.java diff --git a/jonas/jonas/examples/sampleCluster2/src/beans/org/objectweb/haTransactions/ejb/HaTransactionLocal.java b/jonas/examples/sampleCluster2/src/beans/org/objectweb/haTransactions/ejb/HaTransactionLocal.java similarity index 100% rename from jonas/jonas/examples/sampleCluster2/src/beans/org/objectweb/haTransactions/ejb/HaTransactionLocal.java rename to jonas/examples/sampleCluster2/src/beans/org/objectweb/haTransactions/ejb/HaTransactionLocal.java diff --git a/jonas/jonas/examples/sampleCluster2/src/beans/org/objectweb/haTransactions/ejb/HaTransactionLocalHome.java b/jonas/examples/sampleCluster2/src/beans/org/objectweb/haTransactions/ejb/HaTransactionLocalHome.java similarity index 100% rename from jonas/jonas/examples/sampleCluster2/src/beans/org/objectweb/haTransactions/ejb/HaTransactionLocalHome.java rename to jonas/examples/sampleCluster2/src/beans/org/objectweb/haTransactions/ejb/HaTransactionLocalHome.java diff --git a/jonas/jonas/examples/sampleCluster2/src/beans/org/objectweb/haTransactions/ejb/HaTransactionRemote.java b/jonas/examples/sampleCluster2/src/beans/org/objectweb/haTransactions/ejb/HaTransactionRemote.java similarity index 100% rename from jonas/jonas/examples/sampleCluster2/src/beans/org/objectweb/haTransactions/ejb/HaTransactionRemote.java rename to jonas/examples/sampleCluster2/src/beans/org/objectweb/haTransactions/ejb/HaTransactionRemote.java diff --git a/jonas/jonas/examples/sampleCluster2/src/beans/org/objectweb/haTransactions/ejb/HaTransactionSLR.java b/jonas/examples/sampleCluster2/src/beans/org/objectweb/haTransactions/ejb/HaTransactionSLR.java similarity index 100% rename from jonas/jonas/examples/sampleCluster2/src/beans/org/objectweb/haTransactions/ejb/HaTransactionSLR.java rename to jonas/examples/sampleCluster2/src/beans/org/objectweb/haTransactions/ejb/HaTransactionSLR.java diff --git a/jonas/jonas/examples/sampleCluster2/src/beans/org/objectweb/haTransactions/jonas-ejb-jar.xml b/jonas/examples/sampleCluster2/src/beans/org/objectweb/haTransactions/jonas-ejb-jar.xml similarity index 100% rename from jonas/jonas/examples/sampleCluster2/src/beans/org/objectweb/haTransactions/jonas-ejb-jar.xml rename to jonas/examples/sampleCluster2/src/beans/org/objectweb/haTransactions/jonas-ejb-jar.xml diff --git a/jonas/jonas/examples/sampleCluster2/src/beans/org/objectweb/sampleCluster2/ejb/MyEjb1.java b/jonas/examples/sampleCluster2/src/beans/org/objectweb/sampleCluster2/ejb/MyEjb1.java similarity index 100% rename from jonas/jonas/examples/sampleCluster2/src/beans/org/objectweb/sampleCluster2/ejb/MyEjb1.java rename to jonas/examples/sampleCluster2/src/beans/org/objectweb/sampleCluster2/ejb/MyEjb1.java diff --git a/jonas/jonas/examples/sampleCluster2/src/beans/org/objectweb/sampleCluster2/ejb/MyEjb1Home.java b/jonas/examples/sampleCluster2/src/beans/org/objectweb/sampleCluster2/ejb/MyEjb1Home.java similarity index 100% rename from jonas/jonas/examples/sampleCluster2/src/beans/org/objectweb/sampleCluster2/ejb/MyEjb1Home.java rename to jonas/examples/sampleCluster2/src/beans/org/objectweb/sampleCluster2/ejb/MyEjb1Home.java diff --git a/jonas/jonas/examples/sampleCluster2/src/beans/org/objectweb/sampleCluster2/ejb/MyEjb1SLR.java b/jonas/examples/sampleCluster2/src/beans/org/objectweb/sampleCluster2/ejb/MyEjb1SLR.java similarity index 100% rename from jonas/jonas/examples/sampleCluster2/src/beans/org/objectweb/sampleCluster2/ejb/MyEjb1SLR.java rename to jonas/examples/sampleCluster2/src/beans/org/objectweb/sampleCluster2/ejb/MyEjb1SLR.java diff --git a/jonas/jonas/examples/sampleCluster2/src/beans/org/objectweb/sampleCluster2/ejb/MyEntityHome.java b/jonas/examples/sampleCluster2/src/beans/org/objectweb/sampleCluster2/ejb/MyEntityHome.java similarity index 100% rename from jonas/jonas/examples/sampleCluster2/src/beans/org/objectweb/sampleCluster2/ejb/MyEntityHome.java rename to jonas/examples/sampleCluster2/src/beans/org/objectweb/sampleCluster2/ejb/MyEntityHome.java diff --git a/jonas/jonas/examples/sampleCluster2/src/beans/org/objectweb/sampleCluster2/ejb/MyEntityLocal.java b/jonas/examples/sampleCluster2/src/beans/org/objectweb/sampleCluster2/ejb/MyEntityLocal.java similarity index 100% rename from jonas/jonas/examples/sampleCluster2/src/beans/org/objectweb/sampleCluster2/ejb/MyEntityLocal.java rename to jonas/examples/sampleCluster2/src/beans/org/objectweb/sampleCluster2/ejb/MyEntityLocal.java diff --git a/jonas/jonas/examples/sampleCluster2/src/beans/org/objectweb/sampleCluster2/ejb/MyEntityLocalHome.java b/jonas/examples/sampleCluster2/src/beans/org/objectweb/sampleCluster2/ejb/MyEntityLocalHome.java similarity index 100% rename from jonas/jonas/examples/sampleCluster2/src/beans/org/objectweb/sampleCluster2/ejb/MyEntityLocalHome.java rename to jonas/examples/sampleCluster2/src/beans/org/objectweb/sampleCluster2/ejb/MyEntityLocalHome.java diff --git a/jonas/jonas/examples/sampleCluster2/src/beans/org/objectweb/sampleCluster2/ejb/MyEntityRemote.java b/jonas/examples/sampleCluster2/src/beans/org/objectweb/sampleCluster2/ejb/MyEntityRemote.java similarity index 100% rename from jonas/jonas/examples/sampleCluster2/src/beans/org/objectweb/sampleCluster2/ejb/MyEntityRemote.java rename to jonas/examples/sampleCluster2/src/beans/org/objectweb/sampleCluster2/ejb/MyEntityRemote.java diff --git a/jonas/jonas/examples/sampleCluster2/src/beans/org/objectweb/sampleCluster2/ejb/MyEntitySLR.java b/jonas/examples/sampleCluster2/src/beans/org/objectweb/sampleCluster2/ejb/MyEntitySLR.java similarity index 100% rename from jonas/jonas/examples/sampleCluster2/src/beans/org/objectweb/sampleCluster2/ejb/MyEntitySLR.java rename to jonas/examples/sampleCluster2/src/beans/org/objectweb/sampleCluster2/ejb/MyEntitySLR.java diff --git a/jonas/jonas/examples/sampleCluster2/src/beans/org/objectweb/sampleCluster2/ejb/MyException.java b/jonas/examples/sampleCluster2/src/beans/org/objectweb/sampleCluster2/ejb/MyException.java similarity index 100% rename from jonas/jonas/examples/sampleCluster2/src/beans/org/objectweb/sampleCluster2/ejb/MyException.java rename to jonas/examples/sampleCluster2/src/beans/org/objectweb/sampleCluster2/ejb/MyException.java diff --git a/jonas/jonas/examples/sampleCluster2/src/beans/org/objectweb/sampleCluster2/ejb/MyStateful.java b/jonas/examples/sampleCluster2/src/beans/org/objectweb/sampleCluster2/ejb/MyStateful.java similarity index 100% rename from jonas/jonas/examples/sampleCluster2/src/beans/org/objectweb/sampleCluster2/ejb/MyStateful.java rename to jonas/examples/sampleCluster2/src/beans/org/objectweb/sampleCluster2/ejb/MyStateful.java diff --git a/jonas/jonas/examples/sampleCluster2/src/beans/org/objectweb/sampleCluster2/ejb/MyStatefulHome.java b/jonas/examples/sampleCluster2/src/beans/org/objectweb/sampleCluster2/ejb/MyStatefulHome.java similarity index 100% rename from jonas/jonas/examples/sampleCluster2/src/beans/org/objectweb/sampleCluster2/ejb/MyStatefulHome.java rename to jonas/examples/sampleCluster2/src/beans/org/objectweb/sampleCluster2/ejb/MyStatefulHome.java diff --git a/jonas/jonas/examples/sampleCluster2/src/beans/org/objectweb/sampleCluster2/ejb/MyStatefulInner.java b/jonas/examples/sampleCluster2/src/beans/org/objectweb/sampleCluster2/ejb/MyStatefulInner.java similarity index 100% rename from jonas/jonas/examples/sampleCluster2/src/beans/org/objectweb/sampleCluster2/ejb/MyStatefulInner.java rename to jonas/examples/sampleCluster2/src/beans/org/objectweb/sampleCluster2/ejb/MyStatefulInner.java diff --git a/jonas/jonas/examples/sampleCluster2/src/beans/org/objectweb/sampleCluster2/ejb/MyStatefulInnerLocal.java b/jonas/examples/sampleCluster2/src/beans/org/objectweb/sampleCluster2/ejb/MyStatefulInnerLocal.java similarity index 100% rename from jonas/jonas/examples/sampleCluster2/src/beans/org/objectweb/sampleCluster2/ejb/MyStatefulInnerLocal.java rename to jonas/examples/sampleCluster2/src/beans/org/objectweb/sampleCluster2/ejb/MyStatefulInnerLocal.java diff --git a/jonas/jonas/examples/sampleCluster2/src/beans/org/objectweb/sampleCluster2/ejb/MyStatefulInnerLocalHome.java b/jonas/examples/sampleCluster2/src/beans/org/objectweb/sampleCluster2/ejb/MyStatefulInnerLocalHome.java similarity index 100% rename from jonas/jonas/examples/sampleCluster2/src/beans/org/objectweb/sampleCluster2/ejb/MyStatefulInnerLocalHome.java rename to jonas/examples/sampleCluster2/src/beans/org/objectweb/sampleCluster2/ejb/MyStatefulInnerLocalHome.java diff --git a/jonas/jonas/examples/sampleCluster2/src/beans/org/objectweb/sampleCluster2/ejb/MyStatefulSFR.java b/jonas/examples/sampleCluster2/src/beans/org/objectweb/sampleCluster2/ejb/MyStatefulSFR.java similarity index 100% rename from jonas/jonas/examples/sampleCluster2/src/beans/org/objectweb/sampleCluster2/ejb/MyStatefulSFR.java rename to jonas/examples/sampleCluster2/src/beans/org/objectweb/sampleCluster2/ejb/MyStatefulSFR.java diff --git a/jonas/jonas/examples/sampleCluster2/src/build.xml b/jonas/examples/sampleCluster2/src/build.xml similarity index 100% rename from jonas/jonas/examples/sampleCluster2/src/build.xml rename to jonas/examples/sampleCluster2/src/build.xml diff --git a/jonas/jonas/examples/sampleCluster2/src/client/README b/jonas/examples/sampleCluster2/src/client/README similarity index 100% rename from jonas/jonas/examples/sampleCluster2/src/client/README rename to jonas/examples/sampleCluster2/src/client/README diff --git a/jonas/jonas/examples/sampleCluster2/src/client/client.sh b/jonas/examples/sampleCluster2/src/client/client.sh similarity index 100% rename from jonas/jonas/examples/sampleCluster2/src/client/client.sh rename to jonas/examples/sampleCluster2/src/client/client.sh diff --git a/jonas/jonas/examples/sampleCluster2/src/client/clientException.sh b/jonas/examples/sampleCluster2/src/client/clientException.sh similarity index 100% rename from jonas/jonas/examples/sampleCluster2/src/client/clientException.sh rename to jonas/examples/sampleCluster2/src/client/clientException.sh diff --git a/jonas/jonas/examples/sampleCluster2/src/client/clientFOSFSB.sh b/jonas/examples/sampleCluster2/src/client/clientFOSFSB.sh similarity index 100% rename from jonas/jonas/examples/sampleCluster2/src/client/clientFOSFSB.sh rename to jonas/examples/sampleCluster2/src/client/clientFOSFSB.sh diff --git a/jonas/jonas/examples/sampleCluster2/src/client/clientLBHome.sh b/jonas/examples/sampleCluster2/src/client/clientLBHome.sh similarity index 100% rename from jonas/jonas/examples/sampleCluster2/src/client/clientLBHome.sh rename to jonas/examples/sampleCluster2/src/client/clientLBHome.sh diff --git a/jonas/jonas/examples/sampleCluster2/src/client/clientLBLookup.sh b/jonas/examples/sampleCluster2/src/client/clientLBLookup.sh similarity index 100% rename from jonas/jonas/examples/sampleCluster2/src/client/clientLBLookup.sh rename to jonas/examples/sampleCluster2/src/client/clientLBLookup.sh diff --git a/jonas/jonas/examples/sampleCluster2/src/client/clientLBRemote.sh b/jonas/examples/sampleCluster2/src/client/clientLBRemote.sh similarity index 100% rename from jonas/jonas/examples/sampleCluster2/src/client/clientLBRemote.sh rename to jonas/examples/sampleCluster2/src/client/clientLBRemote.sh diff --git a/jonas/jonas/examples/sampleCluster2/src/client/compileLB.sh b/jonas/examples/sampleCluster2/src/client/compileLB.sh similarity index 100% rename from jonas/jonas/examples/sampleCluster2/src/client/compileLB.sh rename to jonas/examples/sampleCluster2/src/client/compileLB.sh diff --git a/jonas/jonas/examples/sampleCluster2/src/client/org/objectweb/sampleCluster2/client/ClientException.java b/jonas/examples/sampleCluster2/src/client/org/objectweb/sampleCluster2/client/ClientException.java similarity index 100% rename from jonas/jonas/examples/sampleCluster2/src/client/org/objectweb/sampleCluster2/client/ClientException.java rename to jonas/examples/sampleCluster2/src/client/org/objectweb/sampleCluster2/client/ClientException.java diff --git a/jonas/jonas/examples/sampleCluster2/src/client/org/objectweb/sampleCluster2/client/ClientFOSFSB.java b/jonas/examples/sampleCluster2/src/client/org/objectweb/sampleCluster2/client/ClientFOSFSB.java similarity index 100% rename from jonas/jonas/examples/sampleCluster2/src/client/org/objectweb/sampleCluster2/client/ClientFOSFSB.java rename to jonas/examples/sampleCluster2/src/client/org/objectweb/sampleCluster2/client/ClientFOSFSB.java diff --git a/jonas/jonas/examples/sampleCluster2/src/client/org/objectweb/sampleCluster2/client/ClientLBHome.java b/jonas/examples/sampleCluster2/src/client/org/objectweb/sampleCluster2/client/ClientLBHome.java similarity index 100% rename from jonas/jonas/examples/sampleCluster2/src/client/org/objectweb/sampleCluster2/client/ClientLBHome.java rename to jonas/examples/sampleCluster2/src/client/org/objectweb/sampleCluster2/client/ClientLBHome.java diff --git a/jonas/jonas/examples/sampleCluster2/src/client/org/objectweb/sampleCluster2/client/ClientLBLookup.java b/jonas/examples/sampleCluster2/src/client/org/objectweb/sampleCluster2/client/ClientLBLookup.java similarity index 100% rename from jonas/jonas/examples/sampleCluster2/src/client/org/objectweb/sampleCluster2/client/ClientLBLookup.java rename to jonas/examples/sampleCluster2/src/client/org/objectweb/sampleCluster2/client/ClientLBLookup.java diff --git a/jonas/jonas/examples/sampleCluster2/src/client/org/objectweb/sampleCluster2/client/ClientLBRemote.java b/jonas/examples/sampleCluster2/src/client/org/objectweb/sampleCluster2/client/ClientLBRemote.java similarity index 100% rename from jonas/jonas/examples/sampleCluster2/src/client/org/objectweb/sampleCluster2/client/ClientLBRemote.java rename to jonas/examples/sampleCluster2/src/client/org/objectweb/sampleCluster2/client/ClientLBRemote.java diff --git a/jonas/jonas/examples/sampleCluster2/src/client/org/objectweb/sampleCluster2/client/ClientUtility.java b/jonas/examples/sampleCluster2/src/client/org/objectweb/sampleCluster2/client/ClientUtility.java similarity index 100% rename from jonas/jonas/examples/sampleCluster2/src/client/org/objectweb/sampleCluster2/client/ClientUtility.java rename to jonas/examples/sampleCluster2/src/client/org/objectweb/sampleCluster2/client/ClientUtility.java diff --git a/jonas/jonas/examples/sampleCluster2/src/sampleCluster2/WEB-INF/jonas-web.xml b/jonas/examples/sampleCluster2/src/sampleCluster2/WEB-INF/jonas-web.xml similarity index 100% rename from jonas/jonas/examples/sampleCluster2/src/sampleCluster2/WEB-INF/jonas-web.xml rename to jonas/examples/sampleCluster2/src/sampleCluster2/WEB-INF/jonas-web.xml diff --git a/jonas/jonas/examples/sampleCluster2/src/sampleCluster2/WEB-INF/web.xml b/jonas/examples/sampleCluster2/src/sampleCluster2/WEB-INF/web.xml similarity index 100% rename from jonas/jonas/examples/sampleCluster2/src/sampleCluster2/WEB-INF/web.xml rename to jonas/examples/sampleCluster2/src/sampleCluster2/WEB-INF/web.xml diff --git a/jonas/jonas/examples/sampleCluster2/src/sampleCluster2/org/objectweb/sampleCluster2/web/AbstractServlet.java b/jonas/examples/sampleCluster2/src/sampleCluster2/org/objectweb/sampleCluster2/web/AbstractServlet.java similarity index 100% rename from jonas/jonas/examples/sampleCluster2/src/sampleCluster2/org/objectweb/sampleCluster2/web/AbstractServlet.java rename to jonas/examples/sampleCluster2/src/sampleCluster2/org/objectweb/sampleCluster2/web/AbstractServlet.java diff --git a/jonas/jonas/examples/sampleCluster2/src/sampleCluster2/org/objectweb/sampleCluster2/web/CheckServlet.java b/jonas/examples/sampleCluster2/src/sampleCluster2/org/objectweb/sampleCluster2/web/CheckServlet.java similarity index 100% rename from jonas/jonas/examples/sampleCluster2/src/sampleCluster2/org/objectweb/sampleCluster2/web/CheckServlet.java rename to jonas/examples/sampleCluster2/src/sampleCluster2/org/objectweb/sampleCluster2/web/CheckServlet.java diff --git a/jonas/jonas/examples/sampleCluster2/src/sampleCluster2/org/objectweb/sampleCluster2/web/ExceptionServlet.java b/jonas/examples/sampleCluster2/src/sampleCluster2/org/objectweb/sampleCluster2/web/ExceptionServlet.java similarity index 100% rename from jonas/jonas/examples/sampleCluster2/src/sampleCluster2/org/objectweb/sampleCluster2/web/ExceptionServlet.java rename to jonas/examples/sampleCluster2/src/sampleCluster2/org/objectweb/sampleCluster2/web/ExceptionServlet.java diff --git a/jonas/jonas/examples/sampleCluster2/src/sampleCluster2/org/objectweb/sampleCluster2/web/ReleaseServlet.java b/jonas/examples/sampleCluster2/src/sampleCluster2/org/objectweb/sampleCluster2/web/ReleaseServlet.java similarity index 100% rename from jonas/jonas/examples/sampleCluster2/src/sampleCluster2/org/objectweb/sampleCluster2/web/ReleaseServlet.java rename to jonas/examples/sampleCluster2/src/sampleCluster2/org/objectweb/sampleCluster2/web/ReleaseServlet.java diff --git a/jonas/jonas/examples/sampleCluster2/src/sampleCluster2/org/objectweb/sampleCluster2/web/SessionServlet.java b/jonas/examples/sampleCluster2/src/sampleCluster2/org/objectweb/sampleCluster2/web/SessionServlet.java similarity index 100% rename from jonas/jonas/examples/sampleCluster2/src/sampleCluster2/org/objectweb/sampleCluster2/web/SessionServlet.java rename to jonas/examples/sampleCluster2/src/sampleCluster2/org/objectweb/sampleCluster2/web/SessionServlet.java diff --git a/jonas/jonas/examples/sampleCluster2/src/sampleCluster2/web/index.html b/jonas/examples/sampleCluster2/src/sampleCluster2/web/index.html similarity index 100% rename from jonas/jonas/examples/sampleCluster2/src/sampleCluster2/web/index.html rename to jonas/examples/sampleCluster2/src/sampleCluster2/web/index.html diff --git a/jonas/jonas/examples/sampleCluster2/src/sampleCluster2/web/jsp/checkRsp.jsp b/jonas/examples/sampleCluster2/src/sampleCluster2/web/jsp/checkRsp.jsp similarity index 100% rename from jonas/jonas/examples/sampleCluster2/src/sampleCluster2/web/jsp/checkRsp.jsp rename to jonas/examples/sampleCluster2/src/sampleCluster2/web/jsp/checkRsp.jsp diff --git a/jonas/jonas/examples/sampleCluster2/src/sampleCluster2/web/jsp/exceptionRsp.jsp b/jonas/examples/sampleCluster2/src/sampleCluster2/web/jsp/exceptionRsp.jsp similarity index 100% rename from jonas/jonas/examples/sampleCluster2/src/sampleCluster2/web/jsp/exceptionRsp.jsp rename to jonas/examples/sampleCluster2/src/sampleCluster2/web/jsp/exceptionRsp.jsp diff --git a/jonas/jonas/examples/sampleCluster2/src/sampleCluster2/web/jsp/releaseRsp.jsp b/jonas/examples/sampleCluster2/src/sampleCluster2/web/jsp/releaseRsp.jsp similarity index 100% rename from jonas/jonas/examples/sampleCluster2/src/sampleCluster2/web/jsp/releaseRsp.jsp rename to jonas/examples/sampleCluster2/src/sampleCluster2/web/jsp/releaseRsp.jsp diff --git a/jonas/jonas/examples/sampleCluster2/src/sampleCluster2/web/jsp/sessionRsp.jsp b/jonas/examples/sampleCluster2/src/sampleCluster2/web/jsp/sessionRsp.jsp similarity index 100% rename from jonas/jonas/examples/sampleCluster2/src/sampleCluster2/web/jsp/sessionRsp.jsp rename to jonas/examples/sampleCluster2/src/sampleCluster2/web/jsp/sessionRsp.jsp diff --git a/jonas/jonas/examples/src/build.xml b/jonas/examples/src/build.xml similarity index 100% rename from jonas/jonas/examples/src/build.xml rename to jonas/examples/src/build.xml diff --git a/jonas/jonas/examples/src/eb/Account.idb b/jonas/examples/src/eb/Account.idb similarity index 100% rename from jonas/jonas/examples/src/eb/Account.idb rename to jonas/examples/src/eb/Account.idb diff --git a/jonas/jonas/examples/src/eb/Account.java b/jonas/examples/src/eb/Account.java similarity index 100% rename from jonas/jonas/examples/src/eb/Account.java rename to jonas/examples/src/eb/Account.java diff --git a/jonas/jonas/examples/src/eb/Account.pgsql b/jonas/examples/src/eb/Account.pgsql similarity index 100% rename from jonas/jonas/examples/src/eb/Account.pgsql rename to jonas/examples/src/eb/Account.pgsql diff --git a/jonas/jonas/examples/src/eb/Account.sql b/jonas/examples/src/eb/Account.sql similarity index 100% rename from jonas/jonas/examples/src/eb/Account.sql rename to jonas/examples/src/eb/Account.sql diff --git a/jonas/jonas/examples/src/eb/AccountExplBean.java b/jonas/examples/src/eb/AccountExplBean.java similarity index 100% rename from jonas/jonas/examples/src/eb/AccountExplBean.java rename to jonas/examples/src/eb/AccountExplBean.java diff --git a/jonas/jonas/examples/src/eb/AccountHome.java b/jonas/examples/src/eb/AccountHome.java similarity index 100% rename from jonas/jonas/examples/src/eb/AccountHome.java rename to jonas/examples/src/eb/AccountHome.java diff --git a/jonas/jonas/examples/src/eb/AccountImpl2Bean.java b/jonas/examples/src/eb/AccountImpl2Bean.java similarity index 100% rename from jonas/jonas/examples/src/eb/AccountImpl2Bean.java rename to jonas/examples/src/eb/AccountImpl2Bean.java diff --git a/jonas/jonas/examples/src/eb/AccountImplBean.java b/jonas/examples/src/eb/AccountImplBean.java similarity index 100% rename from jonas/jonas/examples/src/eb/AccountImplBean.java rename to jonas/examples/src/eb/AccountImplBean.java diff --git a/jonas/jonas/examples/src/eb/Accounthsqldb.sql b/jonas/examples/src/eb/Accounthsqldb.sql similarity index 100% rename from jonas/jonas/examples/src/eb/Accounthsqldb.sql rename to jonas/examples/src/eb/Accounthsqldb.sql diff --git a/jonas/jonas/examples/src/eb/ClientAccount.java b/jonas/examples/src/eb/ClientAccount.java similarity index 100% rename from jonas/jonas/examples/src/eb/ClientAccount.java rename to jonas/examples/src/eb/ClientAccount.java diff --git a/jonas/jonas/examples/src/eb/README b/jonas/examples/src/eb/README similarity index 100% rename from jonas/jonas/examples/src/eb/README rename to jonas/examples/src/eb/README diff --git a/jonas/jonas/examples/src/eb/build.xml b/jonas/examples/src/eb/build.xml similarity index 100% rename from jonas/jonas/examples/src/eb/build.xml rename to jonas/examples/src/eb/build.xml diff --git a/jonas/jonas/examples/src/eb/db1.prp b/jonas/examples/src/eb/db1.prp similarity index 100% rename from jonas/jonas/examples/src/eb/db1.prp rename to jonas/examples/src/eb/db1.prp diff --git a/jonas/jonas/examples/src/eb/eb.xml b/jonas/examples/src/eb/eb.xml similarity index 100% rename from jonas/jonas/examples/src/eb/eb.xml rename to jonas/examples/src/eb/eb.xml diff --git a/jonas/jonas/examples/src/eb/jonas-eb.xml b/jonas/examples/src/eb/jonas-eb.xml similarity index 100% rename from jonas/jonas/examples/src/eb/jonas-eb.xml rename to jonas/examples/src/eb/jonas-eb.xml diff --git a/jonas/jonas/examples/src/jms/Account.prp b/jonas/examples/src/jms/Account.prp similarity index 100% rename from jonas/jonas/examples/src/jms/Account.prp rename to jonas/examples/src/jms/Account.prp diff --git a/jonas/jonas/examples/src/jms/EjbComp.java b/jonas/examples/src/jms/EjbComp.java similarity index 100% rename from jonas/jonas/examples/src/jms/EjbComp.java rename to jonas/examples/src/jms/EjbComp.java diff --git a/jonas/jonas/examples/src/jms/EjbCompBean.java b/jonas/examples/src/jms/EjbCompBean.java similarity index 100% rename from jonas/jonas/examples/src/jms/EjbCompBean.java rename to jonas/examples/src/jms/EjbCompBean.java diff --git a/jonas/jonas/examples/src/jms/EjbCompClient.java b/jonas/examples/src/jms/EjbCompClient.java similarity index 100% rename from jonas/jonas/examples/src/jms/EjbCompClient.java rename to jonas/examples/src/jms/EjbCompClient.java diff --git a/jonas/jonas/examples/src/jms/EjbCompHome.java b/jonas/examples/src/jms/EjbCompHome.java similarity index 100% rename from jonas/jonas/examples/src/jms/EjbCompHome.java rename to jonas/examples/src/jms/EjbCompHome.java diff --git a/jonas/jonas/examples/src/jms/MsgReceptor.java b/jonas/examples/src/jms/MsgReceptor.java similarity index 100% rename from jonas/jonas/examples/src/jms/MsgReceptor.java rename to jonas/examples/src/jms/MsgReceptor.java diff --git a/jonas/jonas/examples/src/jms/README b/jonas/examples/src/jms/README similarity index 100% rename from jonas/jonas/examples/src/jms/README rename to jonas/examples/src/jms/README diff --git a/jonas/jonas/examples/src/jms/jms.xml b/jonas/examples/src/jms/jms.xml similarity index 100% rename from jonas/jonas/examples/src/jms/jms.xml rename to jonas/examples/src/jms/jms.xml diff --git a/jonas/jonas/examples/src/jms/jonas-jms.xml b/jonas/examples/src/jms/jonas-jms.xml similarity index 100% rename from jonas/jonas/examples/src/jms/jonas-jms.xml rename to jonas/examples/src/jms/jonas-jms.xml diff --git a/jonas/jonas/examples/src/jms/run.bat b/jonas/examples/src/jms/run.bat similarity index 100% rename from jonas/jonas/examples/src/jms/run.bat rename to jonas/examples/src/jms/run.bat diff --git a/jonas/jonas/examples/src/jms/run.sh b/jonas/examples/src/jms/run.sh similarity index 100% rename from jonas/jonas/examples/src/jms/run.sh rename to jonas/examples/src/jms/run.sh diff --git a/jonas/jonas/examples/src/lb/Client.java b/jonas/examples/src/lb/Client.java similarity index 100% rename from jonas/jonas/examples/src/lb/Client.java rename to jonas/examples/src/lb/Client.java diff --git a/jonas/jonas/examples/src/lb/ManacEC.java b/jonas/examples/src/lb/ManacEC.java similarity index 100% rename from jonas/jonas/examples/src/lb/ManacEC.java rename to jonas/examples/src/lb/ManacEC.java diff --git a/jonas/jonas/examples/src/lb/ManacLocal.java b/jonas/examples/src/lb/ManacLocal.java similarity index 100% rename from jonas/jonas/examples/src/lb/ManacLocal.java rename to jonas/examples/src/lb/ManacLocal.java diff --git a/jonas/jonas/examples/src/lb/ManacLocalHome.java b/jonas/examples/src/lb/ManacLocalHome.java similarity index 100% rename from jonas/jonas/examples/src/lb/ManacLocalHome.java rename to jonas/examples/src/lb/ManacLocalHome.java diff --git a/jonas/jonas/examples/src/lb/Manager.java b/jonas/examples/src/lb/Manager.java similarity index 100% rename from jonas/jonas/examples/src/lb/Manager.java rename to jonas/examples/src/lb/Manager.java diff --git a/jonas/jonas/examples/src/lb/ManagerHome.java b/jonas/examples/src/lb/ManagerHome.java similarity index 100% rename from jonas/jonas/examples/src/lb/ManagerHome.java rename to jonas/examples/src/lb/ManagerHome.java diff --git a/jonas/jonas/examples/src/lb/ManagerSF.java b/jonas/examples/src/lb/ManagerSF.java similarity index 100% rename from jonas/jonas/examples/src/lb/ManagerSF.java rename to jonas/examples/src/lb/ManagerSF.java diff --git a/jonas/jonas/examples/src/lb/README b/jonas/examples/src/lb/README similarity index 100% rename from jonas/jonas/examples/src/lb/README rename to jonas/examples/src/lb/README diff --git a/jonas/jonas/examples/src/lb/db1.prp b/jonas/examples/src/lb/db1.prp similarity index 100% rename from jonas/jonas/examples/src/lb/db1.prp rename to jonas/examples/src/lb/db1.prp diff --git a/jonas/jonas/examples/src/lb/jonas-lb.xml b/jonas/examples/src/lb/jonas-lb.xml similarity index 100% rename from jonas/jonas/examples/src/lb/jonas-lb.xml rename to jonas/examples/src/lb/jonas-lb.xml diff --git a/jonas/jonas/examples/src/lb/lb.xml b/jonas/examples/src/lb/lb.xml similarity index 100% rename from jonas/jonas/examples/src/lb/lb.xml rename to jonas/examples/src/lb/lb.xml diff --git a/jonas/jonas/examples/src/mailsb/ClientMailer.java b/jonas/examples/src/mailsb/ClientMailer.java similarity index 100% rename from jonas/jonas/examples/src/mailsb/ClientMailer.java rename to jonas/examples/src/mailsb/ClientMailer.java diff --git a/jonas/jonas/examples/src/mailsb/MimePartDSMailer.java b/jonas/examples/src/mailsb/MimePartDSMailer.java similarity index 100% rename from jonas/jonas/examples/src/mailsb/MimePartDSMailer.java rename to jonas/examples/src/mailsb/MimePartDSMailer.java diff --git a/jonas/jonas/examples/src/mailsb/MimePartDSMailerBean.java b/jonas/examples/src/mailsb/MimePartDSMailerBean.java similarity index 100% rename from jonas/jonas/examples/src/mailsb/MimePartDSMailerBean.java rename to jonas/examples/src/mailsb/MimePartDSMailerBean.java diff --git a/jonas/jonas/examples/src/mailsb/MimePartDSMailerHome.java b/jonas/examples/src/mailsb/MimePartDSMailerHome.java similarity index 100% rename from jonas/jonas/examples/src/mailsb/MimePartDSMailerHome.java rename to jonas/examples/src/mailsb/MimePartDSMailerHome.java diff --git a/jonas/jonas/examples/src/mailsb/README b/jonas/examples/src/mailsb/README similarity index 100% rename from jonas/jonas/examples/src/mailsb/README rename to jonas/examples/src/mailsb/README diff --git a/jonas/jonas/examples/src/mailsb/SessionMailer.java b/jonas/examples/src/mailsb/SessionMailer.java similarity index 100% rename from jonas/jonas/examples/src/mailsb/SessionMailer.java rename to jonas/examples/src/mailsb/SessionMailer.java diff --git a/jonas/jonas/examples/src/mailsb/SessionMailerBean.java b/jonas/examples/src/mailsb/SessionMailerBean.java similarity index 100% rename from jonas/jonas/examples/src/mailsb/SessionMailerBean.java rename to jonas/examples/src/mailsb/SessionMailerBean.java diff --git a/jonas/jonas/examples/src/mailsb/SessionMailerHome.java b/jonas/examples/src/mailsb/SessionMailerHome.java similarity index 100% rename from jonas/jonas/examples/src/mailsb/SessionMailerHome.java rename to jonas/examples/src/mailsb/SessionMailerHome.java diff --git a/jonas/jonas/examples/src/mailsb/jonas-mailsb.xml b/jonas/examples/src/mailsb/jonas-mailsb.xml similarity index 100% rename from jonas/jonas/examples/src/mailsb/jonas-mailsb.xml rename to jonas/examples/src/mailsb/jonas-mailsb.xml diff --git a/jonas/jonas/examples/src/mailsb/mailsb.xml b/jonas/examples/src/mailsb/mailsb.xml similarity index 100% rename from jonas/jonas/examples/src/mailsb/mailsb.xml rename to jonas/examples/src/mailsb/mailsb.xml diff --git a/jonas/jonas/examples/src/mdb/newsamplemdb/MdbBean.java b/jonas/examples/src/mdb/newsamplemdb/MdbBean.java similarity index 100% rename from jonas/jonas/examples/src/mdb/newsamplemdb/MdbBean.java rename to jonas/examples/src/mdb/newsamplemdb/MdbBean.java diff --git a/jonas/jonas/examples/src/mdb/newsamplemdb/MdbBean_a.java b/jonas/examples/src/mdb/newsamplemdb/MdbBean_a.java similarity index 100% rename from jonas/jonas/examples/src/mdb/newsamplemdb/MdbBean_a.java rename to jonas/examples/src/mdb/newsamplemdb/MdbBean_a.java diff --git a/jonas/jonas/examples/src/mdb/newsamplemdb/MdbBean_b.java b/jonas/examples/src/mdb/newsamplemdb/MdbBean_b.java similarity index 100% rename from jonas/jonas/examples/src/mdb/newsamplemdb/MdbBean_b.java rename to jonas/examples/src/mdb/newsamplemdb/MdbBean_b.java diff --git a/jonas/jonas/examples/src/mdb/newsamplemdb/MdbClient.java b/jonas/examples/src/mdb/newsamplemdb/MdbClient.java similarity index 100% rename from jonas/jonas/examples/src/mdb/newsamplemdb/MdbClient.java rename to jonas/examples/src/mdb/newsamplemdb/MdbClient.java diff --git a/jonas/jonas/examples/src/mdb/newsamplemdb/README b/jonas/examples/src/mdb/newsamplemdb/README similarity index 100% rename from jonas/jonas/examples/src/mdb/newsamplemdb/README rename to jonas/examples/src/mdb/newsamplemdb/README diff --git a/jonas/jonas/examples/src/mdb/newsamplemdb/jonas-newsamplemdb.xml b/jonas/examples/src/mdb/newsamplemdb/jonas-newsamplemdb.xml similarity index 100% rename from jonas/jonas/examples/src/mdb/newsamplemdb/jonas-newsamplemdb.xml rename to jonas/examples/src/mdb/newsamplemdb/jonas-newsamplemdb.xml diff --git a/jonas/jonas/examples/src/mdb/newsamplemdb/newsamplemdb.xml b/jonas/examples/src/mdb/newsamplemdb/newsamplemdb.xml similarity index 100% rename from jonas/jonas/examples/src/mdb/newsamplemdb/newsamplemdb.xml rename to jonas/examples/src/mdb/newsamplemdb/newsamplemdb.xml diff --git a/jonas/jonas/examples/src/mdb/newsamplemdb/run.bat b/jonas/examples/src/mdb/newsamplemdb/run.bat similarity index 100% rename from jonas/jonas/examples/src/mdb/newsamplemdb/run.bat rename to jonas/examples/src/mdb/newsamplemdb/run.bat diff --git a/jonas/jonas/examples/src/mdb/newsamplemdb/run.sh b/jonas/examples/src/mdb/newsamplemdb/run.sh similarity index 100% rename from jonas/jonas/examples/src/mdb/newsamplemdb/run.sh rename to jonas/examples/src/mdb/newsamplemdb/run.sh diff --git a/jonas/jonas/examples/src/mdb/newsamplemdb2/MdbBean.java b/jonas/examples/src/mdb/newsamplemdb2/MdbBean.java similarity index 100% rename from jonas/jonas/examples/src/mdb/newsamplemdb2/MdbBean.java rename to jonas/examples/src/mdb/newsamplemdb2/MdbBean.java diff --git a/jonas/jonas/examples/src/mdb/newsamplemdb2/MdbBean_a.java b/jonas/examples/src/mdb/newsamplemdb2/MdbBean_a.java similarity index 100% rename from jonas/jonas/examples/src/mdb/newsamplemdb2/MdbBean_a.java rename to jonas/examples/src/mdb/newsamplemdb2/MdbBean_a.java diff --git a/jonas/jonas/examples/src/mdb/newsamplemdb2/MdbBean_b.java b/jonas/examples/src/mdb/newsamplemdb2/MdbBean_b.java similarity index 100% rename from jonas/jonas/examples/src/mdb/newsamplemdb2/MdbBean_b.java rename to jonas/examples/src/mdb/newsamplemdb2/MdbBean_b.java diff --git a/jonas/jonas/examples/src/mdb/newsamplemdb2/MdbClient.java b/jonas/examples/src/mdb/newsamplemdb2/MdbClient.java similarity index 100% rename from jonas/jonas/examples/src/mdb/newsamplemdb2/MdbClient.java rename to jonas/examples/src/mdb/newsamplemdb2/MdbClient.java diff --git a/jonas/jonas/examples/src/mdb/newsamplemdb2/README b/jonas/examples/src/mdb/newsamplemdb2/README similarity index 100% rename from jonas/jonas/examples/src/mdb/newsamplemdb2/README rename to jonas/examples/src/mdb/newsamplemdb2/README diff --git a/jonas/jonas/examples/src/mdb/newsamplemdb2/jonas-newsamplemdb2.xml b/jonas/examples/src/mdb/newsamplemdb2/jonas-newsamplemdb2.xml similarity index 100% rename from jonas/jonas/examples/src/mdb/newsamplemdb2/jonas-newsamplemdb2.xml rename to jonas/examples/src/mdb/newsamplemdb2/jonas-newsamplemdb2.xml diff --git a/jonas/jonas/examples/src/mdb/newsamplemdb2/newsamplemdb2.xml b/jonas/examples/src/mdb/newsamplemdb2/newsamplemdb2.xml similarity index 100% rename from jonas/jonas/examples/src/mdb/newsamplemdb2/newsamplemdb2.xml rename to jonas/examples/src/mdb/newsamplemdb2/newsamplemdb2.xml diff --git a/jonas/jonas/examples/src/mdb/newsamplemdb2/run.bat b/jonas/examples/src/mdb/newsamplemdb2/run.bat similarity index 100% rename from jonas/jonas/examples/src/mdb/newsamplemdb2/run.bat rename to jonas/examples/src/mdb/newsamplemdb2/run.bat diff --git a/jonas/jonas/examples/src/mdb/newsamplemdb2/run.sh b/jonas/examples/src/mdb/newsamplemdb2/run.sh similarity index 100% rename from jonas/jonas/examples/src/mdb/newsamplemdb2/run.sh rename to jonas/examples/src/mdb/newsamplemdb2/run.sh diff --git a/jonas/jonas/examples/src/mdb/sampleappli/Env.java b/jonas/examples/src/mdb/sampleappli/Env.java similarity index 100% rename from jonas/jonas/examples/src/mdb/sampleappli/Env.java rename to jonas/examples/src/mdb/sampleappli/Env.java diff --git a/jonas/jonas/examples/src/mdb/sampleappli/EnvBean.java b/jonas/examples/src/mdb/sampleappli/EnvBean.java similarity index 100% rename from jonas/jonas/examples/src/mdb/sampleappli/EnvBean.java rename to jonas/examples/src/mdb/sampleappli/EnvBean.java diff --git a/jonas/jonas/examples/src/mdb/sampleappli/EnvHome.java b/jonas/examples/src/mdb/sampleappli/EnvHome.java similarity index 100% rename from jonas/jonas/examples/src/mdb/sampleappli/EnvHome.java rename to jonas/examples/src/mdb/sampleappli/EnvHome.java diff --git a/jonas/jonas/examples/src/mdb/sampleappli/OrderBean.java b/jonas/examples/src/mdb/sampleappli/OrderBean.java similarity index 100% rename from jonas/jonas/examples/src/mdb/sampleappli/OrderBean.java rename to jonas/examples/src/mdb/sampleappli/OrderBean.java diff --git a/jonas/jonas/examples/src/mdb/sampleappli/README b/jonas/examples/src/mdb/sampleappli/README similarity index 100% rename from jonas/jonas/examples/src/mdb/sampleappli/README rename to jonas/examples/src/mdb/sampleappli/README diff --git a/jonas/jonas/examples/src/mdb/sampleappli/SampleAppliClient.java b/jonas/examples/src/mdb/sampleappli/SampleAppliClient.java similarity index 100% rename from jonas/jonas/examples/src/mdb/sampleappli/SampleAppliClient.java rename to jonas/examples/src/mdb/sampleappli/SampleAppliClient.java diff --git a/jonas/jonas/examples/src/mdb/sampleappli/Stock.java b/jonas/examples/src/mdb/sampleappli/Stock.java similarity index 100% rename from jonas/jonas/examples/src/mdb/sampleappli/Stock.java rename to jonas/examples/src/mdb/sampleappli/Stock.java diff --git a/jonas/jonas/examples/src/mdb/sampleappli/StockBean.java b/jonas/examples/src/mdb/sampleappli/StockBean.java similarity index 100% rename from jonas/jonas/examples/src/mdb/sampleappli/StockBean.java rename to jonas/examples/src/mdb/sampleappli/StockBean.java diff --git a/jonas/jonas/examples/src/mdb/sampleappli/StockHandlerBean.java b/jonas/examples/src/mdb/sampleappli/StockHandlerBean.java similarity index 100% rename from jonas/jonas/examples/src/mdb/sampleappli/StockHandlerBean.java rename to jonas/examples/src/mdb/sampleappli/StockHandlerBean.java diff --git a/jonas/jonas/examples/src/mdb/sampleappli/StockHome.java b/jonas/examples/src/mdb/sampleappli/StockHome.java similarity index 100% rename from jonas/jonas/examples/src/mdb/sampleappli/StockHome.java rename to jonas/examples/src/mdb/sampleappli/StockHome.java diff --git a/jonas/jonas/examples/src/mdb/sampleappli/db1.prp b/jonas/examples/src/mdb/sampleappli/db1.prp similarity index 100% rename from jonas/jonas/examples/src/mdb/sampleappli/db1.prp rename to jonas/examples/src/mdb/sampleappli/db1.prp diff --git a/jonas/jonas/examples/src/mdb/sampleappli/jonas-sampleappli.xml b/jonas/examples/src/mdb/sampleappli/jonas-sampleappli.xml similarity index 100% rename from jonas/jonas/examples/src/mdb/sampleappli/jonas-sampleappli.xml rename to jonas/examples/src/mdb/sampleappli/jonas-sampleappli.xml diff --git a/jonas/jonas/examples/src/mdb/sampleappli/run.bat b/jonas/examples/src/mdb/sampleappli/run.bat similarity index 100% rename from jonas/jonas/examples/src/mdb/sampleappli/run.bat rename to jonas/examples/src/mdb/sampleappli/run.bat diff --git a/jonas/jonas/examples/src/mdb/sampleappli/run.sh b/jonas/examples/src/mdb/sampleappli/run.sh similarity index 100% rename from jonas/jonas/examples/src/mdb/sampleappli/run.sh rename to jonas/examples/src/mdb/sampleappli/run.sh diff --git a/jonas/jonas/examples/src/mdb/sampleappli/sampleappli.xml b/jonas/examples/src/mdb/sampleappli/sampleappli.xml similarity index 100% rename from jonas/jonas/examples/src/mdb/sampleappli/sampleappli.xml rename to jonas/examples/src/mdb/sampleappli/sampleappli.xml diff --git a/jonas/jonas/examples/src/mdb/samplemdb/MdbBean.java b/jonas/examples/src/mdb/samplemdb/MdbBean.java similarity index 100% rename from jonas/jonas/examples/src/mdb/samplemdb/MdbBean.java rename to jonas/examples/src/mdb/samplemdb/MdbBean.java diff --git a/jonas/jonas/examples/src/mdb/samplemdb/MdbClient.java b/jonas/examples/src/mdb/samplemdb/MdbClient.java similarity index 100% rename from jonas/jonas/examples/src/mdb/samplemdb/MdbClient.java rename to jonas/examples/src/mdb/samplemdb/MdbClient.java diff --git a/jonas/jonas/examples/src/mdb/samplemdb/README b/jonas/examples/src/mdb/samplemdb/README similarity index 100% rename from jonas/jonas/examples/src/mdb/samplemdb/README rename to jonas/examples/src/mdb/samplemdb/README diff --git a/jonas/jonas/examples/src/mdb/samplemdb/jonas-samplemdb.xml b/jonas/examples/src/mdb/samplemdb/jonas-samplemdb.xml similarity index 100% rename from jonas/jonas/examples/src/mdb/samplemdb/jonas-samplemdb.xml rename to jonas/examples/src/mdb/samplemdb/jonas-samplemdb.xml diff --git a/jonas/jonas/examples/src/mdb/samplemdb/run.bat b/jonas/examples/src/mdb/samplemdb/run.bat similarity index 100% rename from jonas/jonas/examples/src/mdb/samplemdb/run.bat rename to jonas/examples/src/mdb/samplemdb/run.bat diff --git a/jonas/jonas/examples/src/mdb/samplemdb/run.sh b/jonas/examples/src/mdb/samplemdb/run.sh similarity index 100% rename from jonas/jonas/examples/src/mdb/samplemdb/run.sh rename to jonas/examples/src/mdb/samplemdb/run.sh diff --git a/jonas/jonas/examples/src/mdb/samplemdb/samplemdb.xml b/jonas/examples/src/mdb/samplemdb/samplemdb.xml similarity index 100% rename from jonas/jonas/examples/src/mdb/samplemdb/samplemdb.xml rename to jonas/examples/src/mdb/samplemdb/samplemdb.xml diff --git a/jonas/jonas/examples/src/run.bat b/jonas/examples/src/run.bat similarity index 100% rename from jonas/jonas/examples/src/run.bat rename to jonas/examples/src/run.bat diff --git a/jonas/jonas/examples/src/run.sh b/jonas/examples/src/run.sh similarity index 100% rename from jonas/jonas/examples/src/run.sh rename to jonas/examples/src/run.sh diff --git a/jonas/jonas/examples/src/sb/ClientOp.java b/jonas/examples/src/sb/ClientOp.java similarity index 100% rename from jonas/jonas/examples/src/sb/ClientOp.java rename to jonas/examples/src/sb/ClientOp.java diff --git a/jonas/jonas/examples/src/sb/Op.java b/jonas/examples/src/sb/Op.java similarity index 100% rename from jonas/jonas/examples/src/sb/Op.java rename to jonas/examples/src/sb/Op.java diff --git a/jonas/jonas/examples/src/sb/OpBean.java b/jonas/examples/src/sb/OpBean.java similarity index 100% rename from jonas/jonas/examples/src/sb/OpBean.java rename to jonas/examples/src/sb/OpBean.java diff --git a/jonas/jonas/examples/src/sb/OpHome.java b/jonas/examples/src/sb/OpHome.java similarity index 100% rename from jonas/jonas/examples/src/sb/OpHome.java rename to jonas/examples/src/sb/OpHome.java diff --git a/jonas/jonas/examples/src/sb/README b/jonas/examples/src/sb/README similarity index 100% rename from jonas/jonas/examples/src/sb/README rename to jonas/examples/src/sb/README diff --git a/jonas/jonas/examples/src/sb/jonas-sb.xml b/jonas/examples/src/sb/jonas-sb.xml similarity index 100% rename from jonas/jonas/examples/src/sb/jonas-sb.xml rename to jonas/examples/src/sb/jonas-sb.xml diff --git a/jonas/jonas/examples/src/sb/sb.xml b/jonas/examples/src/sb/sb.xml similarity index 100% rename from jonas/jonas/examples/src/sb/sb.xml rename to jonas/examples/src/sb/sb.xml diff --git a/jonas/jonas/examples/webservices/README b/jonas/examples/webservices/README similarity index 100% rename from jonas/jonas/examples/webservices/README rename to jonas/examples/webservices/README diff --git a/jonas/jonas/examples/webservices/beans/ws/build.xml b/jonas/examples/webservices/beans/ws/build.xml similarity index 100% rename from jonas/jonas/examples/webservices/beans/ws/build.xml rename to jonas/examples/webservices/beans/ws/build.xml diff --git a/jonas/jonas/examples/webservices/beans/ws/etc/xml/jonas-webservices.xml b/jonas/examples/webservices/beans/ws/etc/xml/jonas-webservices.xml similarity index 100% rename from jonas/jonas/examples/webservices/beans/ws/etc/xml/jonas-webservices.xml rename to jonas/examples/webservices/beans/ws/etc/xml/jonas-webservices.xml diff --git a/jonas/jonas/examples/webservices/beans/ws/etc/xml/ssbEndpointMapping.xml b/jonas/examples/webservices/beans/ws/etc/xml/ssbEndpointMapping.xml similarity index 100% rename from jonas/jonas/examples/webservices/beans/ws/etc/xml/ssbEndpointMapping.xml rename to jonas/examples/webservices/beans/ws/etc/xml/ssbEndpointMapping.xml diff --git a/jonas/jonas/examples/webservices/beans/ws/etc/xml/webservices.xml b/jonas/examples/webservices/beans/ws/etc/xml/webservices.xml similarity index 100% rename from jonas/jonas/examples/webservices/beans/ws/etc/xml/webservices.xml rename to jonas/examples/webservices/beans/ws/etc/xml/webservices.xml diff --git a/jonas/jonas/examples/webservices/beans/ws/etc/xml/wsdl/ssbEndpoint.wsdl b/jonas/examples/webservices/beans/ws/etc/xml/wsdl/ssbEndpoint.wsdl similarity index 100% rename from jonas/jonas/examples/webservices/beans/ws/etc/xml/wsdl/ssbEndpoint.wsdl rename to jonas/examples/webservices/beans/ws/etc/xml/wsdl/ssbEndpoint.wsdl diff --git a/jonas/jonas/examples/webservices/beans/ws/src/org/objectweb/wssample/beans/ws/WSBeanEndpoint.java b/jonas/examples/webservices/beans/ws/src/org/objectweb/wssample/beans/ws/WSBeanEndpoint.java similarity index 100% rename from jonas/jonas/examples/webservices/beans/ws/src/org/objectweb/wssample/beans/ws/WSBeanEndpoint.java rename to jonas/examples/webservices/beans/ws/src/org/objectweb/wssample/beans/ws/WSBeanEndpoint.java diff --git a/jonas/jonas/examples/webservices/beans/ws/src/org/objectweb/wssample/beans/ws/WSBeanEndpointSLL.java b/jonas/examples/webservices/beans/ws/src/org/objectweb/wssample/beans/ws/WSBeanEndpointSLL.java similarity index 100% rename from jonas/jonas/examples/webservices/beans/ws/src/org/objectweb/wssample/beans/ws/WSBeanEndpointSLL.java rename to jonas/examples/webservices/beans/ws/src/org/objectweb/wssample/beans/ws/WSBeanEndpointSLL.java diff --git a/jonas/jonas/examples/webservices/beans/ws/src/org/objectweb/wssample/beans/ws/jonas-wsearsample.xml b/jonas/examples/webservices/beans/ws/src/org/objectweb/wssample/beans/ws/jonas-wsearsample.xml similarity index 100% rename from jonas/jonas/examples/webservices/beans/ws/src/org/objectweb/wssample/beans/ws/jonas-wsearsample.xml rename to jonas/examples/webservices/beans/ws/src/org/objectweb/wssample/beans/ws/jonas-wsearsample.xml diff --git a/jonas/jonas/examples/webservices/beans/ws/src/org/objectweb/wssample/beans/ws/wsearsample.xml b/jonas/examples/webservices/beans/ws/src/org/objectweb/wssample/beans/ws/wsearsample.xml similarity index 100% rename from jonas/jonas/examples/webservices/beans/ws/src/org/objectweb/wssample/beans/ws/wsearsample.xml rename to jonas/examples/webservices/beans/ws/src/org/objectweb/wssample/beans/ws/wsearsample.xml diff --git a/jonas/jonas/examples/webservices/beans/wsclient/build.xml b/jonas/examples/webservices/beans/wsclient/build.xml similarity index 100% rename from jonas/jonas/examples/webservices/beans/wsclient/build.xml rename to jonas/examples/webservices/beans/wsclient/build.xml diff --git a/jonas/jonas/examples/webservices/beans/wsclient/etc/web/images/jetty.gif b/jonas/examples/webservices/beans/wsclient/etc/web/images/jetty.gif similarity index 100% rename from jonas/jonas/examples/webservices/beans/wsclient/etc/web/images/jetty.gif rename to jonas/examples/webservices/beans/wsclient/etc/web/images/jetty.gif diff --git a/jonas/jonas/examples/webservices/beans/wsclient/etc/web/images/jonas.ico b/jonas/examples/webservices/beans/wsclient/etc/web/images/jonas.ico similarity index 100% rename from jonas/jonas/examples/webservices/beans/wsclient/etc/web/images/jonas.ico rename to jonas/examples/webservices/beans/wsclient/etc/web/images/jonas.ico diff --git a/jonas/jonas/examples/webservices/beans/wsclient/etc/web/images/ow_jonas_logo.gif b/jonas/examples/webservices/beans/wsclient/etc/web/images/ow_jonas_logo.gif similarity index 100% rename from jonas/jonas/examples/webservices/beans/wsclient/etc/web/images/ow_jonas_logo.gif rename to jonas/examples/webservices/beans/wsclient/etc/web/images/ow_jonas_logo.gif diff --git a/jonas/jonas/examples/webservices/beans/wsclient/etc/web/images/ow_logo.png b/jonas/examples/webservices/beans/wsclient/etc/web/images/ow_logo.png similarity index 100% rename from jonas/jonas/examples/webservices/beans/wsclient/etc/web/images/ow_logo.png rename to jonas/examples/webservices/beans/wsclient/etc/web/images/ow_logo.png diff --git a/jonas/jonas/examples/webservices/beans/wsclient/etc/web/images/tomcat.gif b/jonas/examples/webservices/beans/wsclient/etc/web/images/tomcat.gif similarity index 100% rename from jonas/jonas/examples/webservices/beans/wsclient/etc/web/images/tomcat.gif rename to jonas/examples/webservices/beans/wsclient/etc/web/images/tomcat.gif diff --git a/jonas/jonas/examples/webservices/beans/wsclient/etc/web/index.html b/jonas/examples/webservices/beans/wsclient/etc/web/index.html similarity index 100% rename from jonas/jonas/examples/webservices/beans/wsclient/etc/web/index.html rename to jonas/examples/webservices/beans/wsclient/etc/web/index.html diff --git a/jonas/jonas/examples/webservices/beans/wsclient/etc/web/search-google.jsp b/jonas/examples/webservices/beans/wsclient/etc/web/search-google.jsp similarity index 100% rename from jonas/jonas/examples/webservices/beans/wsclient/etc/web/search-google.jsp rename to jonas/examples/webservices/beans/wsclient/etc/web/search-google.jsp diff --git a/jonas/jonas/examples/webservices/beans/wsclient/etc/web/style/ow_jonas.css b/jonas/examples/webservices/beans/wsclient/etc/web/style/ow_jonas.css similarity index 100% rename from jonas/jonas/examples/webservices/beans/wsclient/etc/web/style/ow_jonas.css rename to jonas/examples/webservices/beans/wsclient/etc/web/style/ow_jonas.css diff --git a/jonas/jonas/examples/webservices/beans/wsclient/etc/xml/application-wsclient.xml b/jonas/examples/webservices/beans/wsclient/etc/xml/application-wsclient.xml similarity index 100% rename from jonas/jonas/examples/webservices/beans/wsclient/etc/xml/application-wsclient.xml rename to jonas/examples/webservices/beans/wsclient/etc/xml/application-wsclient.xml diff --git a/jonas/jonas/examples/webservices/beans/wsclient/etc/xml/ejb-jar.xml b/jonas/examples/webservices/beans/wsclient/etc/xml/ejb-jar.xml similarity index 100% rename from jonas/jonas/examples/webservices/beans/wsclient/etc/xml/ejb-jar.xml rename to jonas/examples/webservices/beans/wsclient/etc/xml/ejb-jar.xml diff --git a/jonas/jonas/examples/webservices/beans/wsclient/etc/xml/googleMapping.xml b/jonas/examples/webservices/beans/wsclient/etc/xml/googleMapping.xml similarity index 100% rename from jonas/jonas/examples/webservices/beans/wsclient/etc/xml/googleMapping.xml rename to jonas/examples/webservices/beans/wsclient/etc/xml/googleMapping.xml diff --git a/jonas/jonas/examples/webservices/beans/wsclient/etc/xml/jonas-ejb-jar.xml b/jonas/examples/webservices/beans/wsclient/etc/xml/jonas-ejb-jar.xml similarity index 100% rename from jonas/jonas/examples/webservices/beans/wsclient/etc/xml/jonas-ejb-jar.xml rename to jonas/examples/webservices/beans/wsclient/etc/xml/jonas-ejb-jar.xml diff --git a/jonas/jonas/examples/webservices/beans/wsclient/etc/xml/web-wsclient-front.xml b/jonas/examples/webservices/beans/wsclient/etc/xml/web-wsclient-front.xml similarity index 100% rename from jonas/jonas/examples/webservices/beans/wsclient/etc/xml/web-wsclient-front.xml rename to jonas/examples/webservices/beans/wsclient/etc/xml/web-wsclient-front.xml diff --git a/jonas/jonas/examples/webservices/beans/wsclient/etc/xml/wsdl/GoogleSearch.wsdl b/jonas/examples/webservices/beans/wsclient/etc/xml/wsdl/GoogleSearch.wsdl similarity index 100% rename from jonas/jonas/examples/webservices/beans/wsclient/etc/xml/wsdl/GoogleSearch.wsdl rename to jonas/examples/webservices/beans/wsclient/etc/xml/wsdl/GoogleSearch.wsdl diff --git a/jonas/jonas/examples/webservices/beans/wsclient/src/org/objectweb/wssample/beans/wsclient/GoogleClientBean.java b/jonas/examples/webservices/beans/wsclient/src/org/objectweb/wssample/beans/wsclient/GoogleClientBean.java similarity index 100% rename from jonas/jonas/examples/webservices/beans/wsclient/src/org/objectweb/wssample/beans/wsclient/GoogleClientBean.java rename to jonas/examples/webservices/beans/wsclient/src/org/objectweb/wssample/beans/wsclient/GoogleClientBean.java diff --git a/jonas/jonas/examples/webservices/beans/wsclient/src/org/objectweb/wssample/beans/wsclient/GoogleClientBeanHome.java b/jonas/examples/webservices/beans/wsclient/src/org/objectweb/wssample/beans/wsclient/GoogleClientBeanHome.java similarity index 100% rename from jonas/jonas/examples/webservices/beans/wsclient/src/org/objectweb/wssample/beans/wsclient/GoogleClientBeanHome.java rename to jonas/examples/webservices/beans/wsclient/src/org/objectweb/wssample/beans/wsclient/GoogleClientBeanHome.java diff --git a/jonas/jonas/examples/webservices/beans/wsclient/src/org/objectweb/wssample/beans/wsclient/GoogleClientBeanSLR.java b/jonas/examples/webservices/beans/wsclient/src/org/objectweb/wssample/beans/wsclient/GoogleClientBeanSLR.java similarity index 100% rename from jonas/jonas/examples/webservices/beans/wsclient/src/org/objectweb/wssample/beans/wsclient/GoogleClientBeanSLR.java rename to jonas/examples/webservices/beans/wsclient/src/org/objectweb/wssample/beans/wsclient/GoogleClientBeanSLR.java diff --git a/jonas/jonas/examples/webservices/beans/wsclient/src/org/objectweb/wssample/genbean/google/DirectoryCategory.java b/jonas/examples/webservices/beans/wsclient/src/org/objectweb/wssample/genbean/google/DirectoryCategory.java similarity index 100% rename from jonas/jonas/examples/webservices/beans/wsclient/src/org/objectweb/wssample/genbean/google/DirectoryCategory.java rename to jonas/examples/webservices/beans/wsclient/src/org/objectweb/wssample/genbean/google/DirectoryCategory.java diff --git a/jonas/jonas/examples/webservices/beans/wsclient/src/org/objectweb/wssample/genbean/google/GoogleSearchPort.java b/jonas/examples/webservices/beans/wsclient/src/org/objectweb/wssample/genbean/google/GoogleSearchPort.java similarity index 100% rename from jonas/jonas/examples/webservices/beans/wsclient/src/org/objectweb/wssample/genbean/google/GoogleSearchPort.java rename to jonas/examples/webservices/beans/wsclient/src/org/objectweb/wssample/genbean/google/GoogleSearchPort.java diff --git a/jonas/jonas/examples/webservices/beans/wsclient/src/org/objectweb/wssample/genbean/google/GoogleSearchResult.java b/jonas/examples/webservices/beans/wsclient/src/org/objectweb/wssample/genbean/google/GoogleSearchResult.java similarity index 100% rename from jonas/jonas/examples/webservices/beans/wsclient/src/org/objectweb/wssample/genbean/google/GoogleSearchResult.java rename to jonas/examples/webservices/beans/wsclient/src/org/objectweb/wssample/genbean/google/GoogleSearchResult.java diff --git a/jonas/jonas/examples/webservices/beans/wsclient/src/org/objectweb/wssample/genbean/google/GoogleSearchService.java b/jonas/examples/webservices/beans/wsclient/src/org/objectweb/wssample/genbean/google/GoogleSearchService.java similarity index 100% rename from jonas/jonas/examples/webservices/beans/wsclient/src/org/objectweb/wssample/genbean/google/GoogleSearchService.java rename to jonas/examples/webservices/beans/wsclient/src/org/objectweb/wssample/genbean/google/GoogleSearchService.java diff --git a/jonas/jonas/examples/webservices/beans/wsclient/src/org/objectweb/wssample/genbean/google/ResultElement.java b/jonas/examples/webservices/beans/wsclient/src/org/objectweb/wssample/genbean/google/ResultElement.java similarity index 100% rename from jonas/jonas/examples/webservices/beans/wsclient/src/org/objectweb/wssample/genbean/google/ResultElement.java rename to jonas/examples/webservices/beans/wsclient/src/org/objectweb/wssample/genbean/google/ResultElement.java diff --git a/jonas/jonas/examples/webservices/build.xml b/jonas/examples/webservices/build.xml similarity index 100% rename from jonas/jonas/examples/webservices/build.xml rename to jonas/examples/webservices/build.xml diff --git a/jonas/jonas/examples/webservices/etc/xml/application.xml b/jonas/examples/webservices/etc/xml/application.xml similarity index 100% rename from jonas/jonas/examples/webservices/etc/xml/application.xml rename to jonas/examples/webservices/etc/xml/application.xml diff --git a/jonas/jonas/examples/webservices/webs/webclient/build.xml b/jonas/examples/webservices/webs/webclient/build.xml similarity index 100% rename from jonas/jonas/examples/webservices/webs/webclient/build.xml rename to jonas/examples/webservices/webs/webclient/build.xml diff --git a/jonas/jonas/examples/webservices/webs/webclient/etc/resources/googleByJSP.jsp b/jonas/examples/webservices/webs/webclient/etc/resources/googleByJSP.jsp similarity index 100% rename from jonas/jonas/examples/webservices/webs/webclient/etc/resources/googleByJSP.jsp rename to jonas/examples/webservices/webs/webclient/etc/resources/googleByJSP.jsp diff --git a/jonas/jonas/examples/webservices/webs/webclient/etc/resources/googleByServlet.html b/jonas/examples/webservices/webs/webclient/etc/resources/googleByServlet.html similarity index 100% rename from jonas/jonas/examples/webservices/webs/webclient/etc/resources/googleByServlet.html rename to jonas/examples/webservices/webs/webclient/etc/resources/googleByServlet.html diff --git a/jonas/jonas/examples/webservices/webs/webclient/etc/resources/images/jetty.gif b/jonas/examples/webservices/webs/webclient/etc/resources/images/jetty.gif similarity index 100% rename from jonas/jonas/examples/webservices/webs/webclient/etc/resources/images/jetty.gif rename to jonas/examples/webservices/webs/webclient/etc/resources/images/jetty.gif diff --git a/jonas/jonas/examples/webservices/webs/webclient/etc/resources/images/jonas.ico b/jonas/examples/webservices/webs/webclient/etc/resources/images/jonas.ico similarity index 100% rename from jonas/jonas/examples/webservices/webs/webclient/etc/resources/images/jonas.ico rename to jonas/examples/webservices/webs/webclient/etc/resources/images/jonas.ico diff --git a/jonas/jonas/examples/webservices/webs/webclient/etc/resources/images/ow_jonas_logo.gif b/jonas/examples/webservices/webs/webclient/etc/resources/images/ow_jonas_logo.gif similarity index 100% rename from jonas/jonas/examples/webservices/webs/webclient/etc/resources/images/ow_jonas_logo.gif rename to jonas/examples/webservices/webs/webclient/etc/resources/images/ow_jonas_logo.gif diff --git a/jonas/jonas/examples/webservices/webs/webclient/etc/resources/images/ow_logo.png b/jonas/examples/webservices/webs/webclient/etc/resources/images/ow_logo.png similarity index 100% rename from jonas/jonas/examples/webservices/webs/webclient/etc/resources/images/ow_logo.png rename to jonas/examples/webservices/webs/webclient/etc/resources/images/ow_logo.png diff --git a/jonas/jonas/examples/webservices/webs/webclient/etc/resources/images/tomcat.gif b/jonas/examples/webservices/webs/webclient/etc/resources/images/tomcat.gif similarity index 100% rename from jonas/jonas/examples/webservices/webs/webclient/etc/resources/images/tomcat.gif rename to jonas/examples/webservices/webs/webclient/etc/resources/images/tomcat.gif diff --git a/jonas/jonas/examples/webservices/webs/webclient/etc/resources/index.html b/jonas/examples/webservices/webs/webclient/etc/resources/index.html similarity index 100% rename from jonas/jonas/examples/webservices/webs/webclient/etc/resources/index.html rename to jonas/examples/webservices/webs/webclient/etc/resources/index.html diff --git a/jonas/jonas/examples/webservices/webs/webclient/etc/resources/style/ow_jonas.css b/jonas/examples/webservices/webs/webclient/etc/resources/style/ow_jonas.css similarity index 100% rename from jonas/jonas/examples/webservices/webs/webclient/etc/resources/style/ow_jonas.css rename to jonas/examples/webservices/webs/webclient/etc/resources/style/ow_jonas.css diff --git a/jonas/jonas/examples/webservices/webs/webclient/etc/xml/googleMapping.xml b/jonas/examples/webservices/webs/webclient/etc/xml/googleMapping.xml similarity index 100% rename from jonas/jonas/examples/webservices/webs/webclient/etc/xml/googleMapping.xml rename to jonas/examples/webservices/webs/webclient/etc/xml/googleMapping.xml diff --git a/jonas/jonas/examples/webservices/webs/webclient/etc/xml/jonas-web.xml b/jonas/examples/webservices/webs/webclient/etc/xml/jonas-web.xml similarity index 100% rename from jonas/jonas/examples/webservices/webs/webclient/etc/xml/jonas-web.xml rename to jonas/examples/webservices/webs/webclient/etc/xml/jonas-web.xml diff --git a/jonas/jonas/examples/webservices/webs/webclient/etc/xml/web.xml b/jonas/examples/webservices/webs/webclient/etc/xml/web.xml similarity index 100% rename from jonas/jonas/examples/webservices/webs/webclient/etc/xml/web.xml rename to jonas/examples/webservices/webs/webclient/etc/xml/web.xml diff --git a/jonas/jonas/examples/webservices/webs/webclient/etc/xml/wsdl/GoogleSearch.wsdl b/jonas/examples/webservices/webs/webclient/etc/xml/wsdl/GoogleSearch.wsdl similarity index 100% rename from jonas/jonas/examples/webservices/webs/webclient/etc/xml/wsdl/GoogleSearch.wsdl rename to jonas/examples/webservices/webs/webclient/etc/xml/wsdl/GoogleSearch.wsdl diff --git a/jonas/jonas/examples/webservices/webs/webclient/src/org/objectweb/wssample/gen/google/DirectoryCategory.java b/jonas/examples/webservices/webs/webclient/src/org/objectweb/wssample/gen/google/DirectoryCategory.java similarity index 100% rename from jonas/jonas/examples/webservices/webs/webclient/src/org/objectweb/wssample/gen/google/DirectoryCategory.java rename to jonas/examples/webservices/webs/webclient/src/org/objectweb/wssample/gen/google/DirectoryCategory.java diff --git a/jonas/jonas/examples/webservices/webs/webclient/src/org/objectweb/wssample/gen/google/GoogleSearchPort.java b/jonas/examples/webservices/webs/webclient/src/org/objectweb/wssample/gen/google/GoogleSearchPort.java similarity index 100% rename from jonas/jonas/examples/webservices/webs/webclient/src/org/objectweb/wssample/gen/google/GoogleSearchPort.java rename to jonas/examples/webservices/webs/webclient/src/org/objectweb/wssample/gen/google/GoogleSearchPort.java diff --git a/jonas/jonas/examples/webservices/webs/webclient/src/org/objectweb/wssample/gen/google/GoogleSearchResult.java b/jonas/examples/webservices/webs/webclient/src/org/objectweb/wssample/gen/google/GoogleSearchResult.java similarity index 100% rename from jonas/jonas/examples/webservices/webs/webclient/src/org/objectweb/wssample/gen/google/GoogleSearchResult.java rename to jonas/examples/webservices/webs/webclient/src/org/objectweb/wssample/gen/google/GoogleSearchResult.java diff --git a/jonas/jonas/examples/webservices/webs/webclient/src/org/objectweb/wssample/gen/google/GoogleSearchService.java b/jonas/examples/webservices/webs/webclient/src/org/objectweb/wssample/gen/google/GoogleSearchService.java similarity index 100% rename from jonas/jonas/examples/webservices/webs/webclient/src/org/objectweb/wssample/gen/google/GoogleSearchService.java rename to jonas/examples/webservices/webs/webclient/src/org/objectweb/wssample/gen/google/GoogleSearchService.java diff --git a/jonas/jonas/examples/webservices/webs/webclient/src/org/objectweb/wssample/gen/google/ResultElement.java b/jonas/examples/webservices/webs/webclient/src/org/objectweb/wssample/gen/google/ResultElement.java similarity index 100% rename from jonas/jonas/examples/webservices/webs/webclient/src/org/objectweb/wssample/gen/google/ResultElement.java rename to jonas/examples/webservices/webs/webclient/src/org/objectweb/wssample/gen/google/ResultElement.java diff --git a/jonas/jonas/examples/webservices/webs/webclient/src/org/objectweb/wssample/servlets/wsclient/WsClientServlet.java b/jonas/examples/webservices/webs/webclient/src/org/objectweb/wssample/servlets/wsclient/WsClientServlet.java similarity index 100% rename from jonas/jonas/examples/webservices/webs/webclient/src/org/objectweb/wssample/servlets/wsclient/WsClientServlet.java rename to jonas/examples/webservices/webs/webclient/src/org/objectweb/wssample/servlets/wsclient/WsClientServlet.java diff --git a/jonas/jonas/examples/webservices/webs/webendpoint/README b/jonas/examples/webservices/webs/webendpoint/README similarity index 100% rename from jonas/jonas/examples/webservices/webs/webendpoint/README rename to jonas/examples/webservices/webs/webendpoint/README diff --git a/jonas/jonas/examples/webservices/webs/webendpoint/build.xml b/jonas/examples/webservices/webs/webendpoint/build.xml similarity index 100% rename from jonas/jonas/examples/webservices/webs/webendpoint/build.xml rename to jonas/examples/webservices/webs/webendpoint/build.xml diff --git a/jonas/jonas/examples/webservices/webs/webendpoint/etc/resources/sample-crypto.properties b/jonas/examples/webservices/webs/webendpoint/etc/resources/sample-crypto.properties similarity index 100% rename from jonas/jonas/examples/webservices/webs/webendpoint/etc/resources/sample-crypto.properties rename to jonas/examples/webservices/webs/webendpoint/etc/resources/sample-crypto.properties diff --git a/jonas/jonas/examples/webservices/webs/webendpoint/etc/web/images/jetty.gif b/jonas/examples/webservices/webs/webendpoint/etc/web/images/jetty.gif similarity index 100% rename from jonas/jonas/examples/webservices/webs/webendpoint/etc/web/images/jetty.gif rename to jonas/examples/webservices/webs/webendpoint/etc/web/images/jetty.gif diff --git a/jonas/jonas/examples/webservices/webs/webendpoint/etc/web/images/jonas.ico b/jonas/examples/webservices/webs/webendpoint/etc/web/images/jonas.ico similarity index 100% rename from jonas/jonas/examples/webservices/webs/webendpoint/etc/web/images/jonas.ico rename to jonas/examples/webservices/webs/webendpoint/etc/web/images/jonas.ico diff --git a/jonas/jonas/examples/webservices/webs/webendpoint/etc/web/images/ow_jonas_logo.gif b/jonas/examples/webservices/webs/webendpoint/etc/web/images/ow_jonas_logo.gif similarity index 100% rename from jonas/jonas/examples/webservices/webs/webendpoint/etc/web/images/ow_jonas_logo.gif rename to jonas/examples/webservices/webs/webendpoint/etc/web/images/ow_jonas_logo.gif diff --git a/jonas/jonas/examples/webservices/webs/webendpoint/etc/web/images/ow_logo.png b/jonas/examples/webservices/webs/webendpoint/etc/web/images/ow_logo.png similarity index 100% rename from jonas/jonas/examples/webservices/webs/webendpoint/etc/web/images/ow_logo.png rename to jonas/examples/webservices/webs/webendpoint/etc/web/images/ow_logo.png diff --git a/jonas/jonas/examples/webservices/webs/webendpoint/etc/web/images/tomcat.gif b/jonas/examples/webservices/webs/webendpoint/etc/web/images/tomcat.gif similarity index 100% rename from jonas/jonas/examples/webservices/webs/webendpoint/etc/web/images/tomcat.gif rename to jonas/examples/webservices/webs/webendpoint/etc/web/images/tomcat.gif diff --git a/jonas/jonas/examples/webservices/webs/webendpoint/etc/web/index.html b/jonas/examples/webservices/webs/webendpoint/etc/web/index.html similarity index 100% rename from jonas/jonas/examples/webservices/webs/webendpoint/etc/web/index.html rename to jonas/examples/webservices/webs/webendpoint/etc/web/index.html diff --git a/jonas/jonas/examples/webservices/webs/webendpoint/etc/web/jaxrpcTest.jsp b/jonas/examples/webservices/webs/webendpoint/etc/web/jaxrpcTest.jsp similarity index 100% rename from jonas/jonas/examples/webservices/webs/webendpoint/etc/web/jaxrpcTest.jsp rename to jonas/examples/webservices/webs/webendpoint/etc/web/jaxrpcTest.jsp diff --git a/jonas/jonas/examples/webservices/webs/webendpoint/etc/web/style/ow_jonas.css b/jonas/examples/webservices/webs/webendpoint/etc/web/style/ow_jonas.css similarity index 100% rename from jonas/jonas/examples/webservices/webs/webendpoint/etc/web/style/ow_jonas.css rename to jonas/examples/webservices/webs/webendpoint/etc/web/style/ow_jonas.css diff --git a/jonas/jonas/examples/webservices/webs/webendpoint/etc/xml/clientMapping.xml b/jonas/examples/webservices/webs/webendpoint/etc/xml/clientMapping.xml similarity index 100% rename from jonas/jonas/examples/webservices/webs/webendpoint/etc/xml/clientMapping.xml rename to jonas/examples/webservices/webs/webendpoint/etc/xml/clientMapping.xml diff --git a/jonas/jonas/examples/webservices/webs/webendpoint/etc/xml/jaxrpcEndpointMapping.xml b/jonas/examples/webservices/webs/webendpoint/etc/xml/jaxrpcEndpointMapping.xml similarity index 100% rename from jonas/jonas/examples/webservices/webs/webendpoint/etc/xml/jaxrpcEndpointMapping.xml rename to jonas/examples/webservices/webs/webendpoint/etc/xml/jaxrpcEndpointMapping.xml diff --git a/jonas/jonas/examples/webservices/webs/webendpoint/etc/xml/jonas-webservices.xml b/jonas/examples/webservices/webs/webendpoint/etc/xml/jonas-webservices.xml similarity index 100% rename from jonas/jonas/examples/webservices/webs/webendpoint/etc/xml/jonas-webservices.xml rename to jonas/examples/webservices/webs/webendpoint/etc/xml/jonas-webservices.xml diff --git a/jonas/jonas/examples/webservices/webs/webendpoint/etc/xml/web.xml b/jonas/examples/webservices/webs/webendpoint/etc/xml/web.xml similarity index 100% rename from jonas/jonas/examples/webservices/webs/webendpoint/etc/xml/web.xml rename to jonas/examples/webservices/webs/webendpoint/etc/xml/web.xml diff --git a/jonas/jonas/examples/webservices/webs/webendpoint/etc/xml/webservices.xml b/jonas/examples/webservices/webs/webendpoint/etc/xml/webservices.xml similarity index 100% rename from jonas/jonas/examples/webservices/webs/webendpoint/etc/xml/webservices.xml rename to jonas/examples/webservices/webs/webendpoint/etc/xml/webservices.xml diff --git a/jonas/jonas/examples/webservices/webs/webendpoint/etc/xml/wsdl/jaxrpcEndpoint.wsdl b/jonas/examples/webservices/webs/webendpoint/etc/xml/wsdl/jaxrpcEndpoint.wsdl similarity index 100% rename from jonas/jonas/examples/webservices/webs/webendpoint/etc/xml/wsdl/jaxrpcEndpoint.wsdl rename to jonas/examples/webservices/webs/webendpoint/etc/xml/wsdl/jaxrpcEndpoint.wsdl diff --git a/jonas/jonas/examples/webservices/webs/webendpoint/src/org/objectweb/wssample/gen/jaxrpc/JaxRpcEndpointInterface.java b/jonas/examples/webservices/webs/webendpoint/src/org/objectweb/wssample/gen/jaxrpc/JaxRpcEndpointInterface.java similarity index 100% rename from jonas/jonas/examples/webservices/webs/webendpoint/src/org/objectweb/wssample/gen/jaxrpc/JaxRpcEndpointInterface.java rename to jonas/examples/webservices/webs/webendpoint/src/org/objectweb/wssample/gen/jaxrpc/JaxRpcEndpointInterface.java diff --git a/jonas/jonas/examples/webservices/webs/webendpoint/src/org/objectweb/wssample/gen/jaxrpc/JaxRpcEndpointInterfaceService.java b/jonas/examples/webservices/webs/webendpoint/src/org/objectweb/wssample/gen/jaxrpc/JaxRpcEndpointInterfaceService.java similarity index 100% rename from jonas/jonas/examples/webservices/webs/webendpoint/src/org/objectweb/wssample/gen/jaxrpc/JaxRpcEndpointInterfaceService.java rename to jonas/examples/webservices/webs/webendpoint/src/org/objectweb/wssample/gen/jaxrpc/JaxRpcEndpointInterfaceService.java diff --git a/jonas/jonas/examples/webservices/webs/webendpoint/src/org/objectweb/wssample/security/ServerSideCallbackHandler.java b/jonas/examples/webservices/webs/webendpoint/src/org/objectweb/wssample/security/ServerSideCallbackHandler.java similarity index 100% rename from jonas/jonas/examples/webservices/webs/webendpoint/src/org/objectweb/wssample/security/ServerSideCallbackHandler.java rename to jonas/examples/webservices/webs/webendpoint/src/org/objectweb/wssample/security/ServerSideCallbackHandler.java diff --git a/jonas/jonas/examples/webservices/webs/webendpoint/src/org/objectweb/wssample/servlets/ws/JaxRpcEndpoint.java b/jonas/examples/webservices/webs/webendpoint/src/org/objectweb/wssample/servlets/ws/JaxRpcEndpoint.java similarity index 100% rename from jonas/jonas/examples/webservices/webs/webendpoint/src/org/objectweb/wssample/servlets/ws/JaxRpcEndpoint.java rename to jonas/examples/webservices/webs/webendpoint/src/org/objectweb/wssample/servlets/ws/JaxRpcEndpoint.java diff --git a/jonas/jonas/examples/webservices/webs/webendpoint/src/org/objectweb/wssample/servlets/ws/JaxRpcEndpointInterface.java b/jonas/examples/webservices/webs/webendpoint/src/org/objectweb/wssample/servlets/ws/JaxRpcEndpointInterface.java similarity index 100% rename from jonas/jonas/examples/webservices/webs/webendpoint/src/org/objectweb/wssample/servlets/ws/JaxRpcEndpointInterface.java rename to jonas/examples/webservices/webs/webendpoint/src/org/objectweb/wssample/servlets/ws/JaxRpcEndpointInterface.java diff --git a/jonas/jonas/examples/webservices/webs/webendpoint/src/org/objectweb/wssample/servlets/wsclient/JOnASJaxRpcClientServlet.java b/jonas/examples/webservices/webs/webendpoint/src/org/objectweb/wssample/servlets/wsclient/JOnASJaxRpcClientServlet.java similarity index 100% rename from jonas/jonas/examples/webservices/webs/webendpoint/src/org/objectweb/wssample/servlets/wsclient/JOnASJaxRpcClientServlet.java rename to jonas/examples/webservices/webs/webendpoint/src/org/objectweb/wssample/servlets/wsclient/JOnASJaxRpcClientServlet.java diff --git a/jonas/jonas/examples/xdoclet/ClientCustomer.java b/jonas/examples/xdoclet/ClientCustomer.java similarity index 100% rename from jonas/jonas/examples/xdoclet/ClientCustomer.java rename to jonas/examples/xdoclet/ClientCustomer.java diff --git a/jonas/jonas/examples/xdoclet/CustomerBean.java b/jonas/examples/xdoclet/CustomerBean.java similarity index 100% rename from jonas/jonas/examples/xdoclet/CustomerBean.java rename to jonas/examples/xdoclet/CustomerBean.java diff --git a/jonas/jonas/examples/xdoclet/Name.java b/jonas/examples/xdoclet/Name.java similarity index 100% rename from jonas/jonas/examples/xdoclet/Name.java rename to jonas/examples/xdoclet/Name.java diff --git a/jonas/jonas/examples/xdoclet/PhoneBean.java b/jonas/examples/xdoclet/PhoneBean.java similarity index 100% rename from jonas/jonas/examples/xdoclet/PhoneBean.java rename to jonas/examples/xdoclet/PhoneBean.java diff --git a/jonas/jonas/examples/xdoclet/README b/jonas/examples/xdoclet/README similarity index 100% rename from jonas/jonas/examples/xdoclet/README rename to jonas/examples/xdoclet/README diff --git a/jonas/jonas/examples/xdoclet/build.xml b/jonas/examples/xdoclet/build.xml similarity index 100% rename from jonas/jonas/examples/xdoclet/build.xml rename to jonas/examples/xdoclet/build.xml diff --git a/jonas/jonas/externals/README b/jonas/externals/README similarity index 100% rename from jonas/jonas/externals/README rename to jonas/externals/README diff --git a/jonas/jonas/externals/commons/README b/jonas/externals/commons/README similarity index 100% rename from jonas/jonas/externals/commons/README rename to jonas/externals/commons/README diff --git a/jonas/jonas/externals/commons/j2ee/README b/jonas/externals/commons/j2ee/README similarity index 100% rename from jonas/jonas/externals/commons/j2ee/README rename to jonas/externals/commons/j2ee/README diff --git a/jonas/jonas/externals/commons/j2ee/connector-1_5.jar b/jonas/externals/commons/j2ee/connector-1_5.jar similarity index 100% rename from jonas/jonas/externals/commons/j2ee/connector-1_5.jar rename to jonas/externals/commons/j2ee/connector-1_5.jar diff --git a/jonas/jonas/externals/commons/j2ee/ejb-2_1-api.jar b/jonas/externals/commons/j2ee/ejb-2_1-api.jar similarity index 100% rename from jonas/jonas/externals/commons/j2ee/ejb-2_1-api.jar rename to jonas/externals/commons/j2ee/ejb-2_1-api.jar diff --git a/jonas/jonas/externals/commons/j2ee/emb-jsr86-api.jar b/jonas/externals/commons/j2ee/emb-jsr86-api.jar similarity index 100% rename from jonas/jonas/externals/commons/j2ee/emb-jsr86-api.jar rename to jonas/externals/commons/j2ee/emb-jsr86-api.jar diff --git a/jonas/jonas/externals/commons/j2ee/gnu-jaf.jar b/jonas/externals/commons/j2ee/gnu-jaf.jar similarity index 100% rename from jonas/jonas/externals/commons/j2ee/gnu-jaf.jar rename to jonas/externals/commons/j2ee/gnu-jaf.jar diff --git a/jonas/jonas/externals/commons/j2ee/gnu-mail.jar b/jonas/externals/commons/j2ee/gnu-mail.jar similarity index 100% rename from jonas/jonas/externals/commons/j2ee/gnu-mail.jar rename to jonas/externals/commons/j2ee/gnu-mail.jar diff --git a/jonas/jonas/externals/commons/j2ee/gnu-providers.jar b/jonas/externals/commons/j2ee/gnu-providers.jar similarity index 100% rename from jonas/jonas/externals/commons/j2ee/gnu-providers.jar rename to jonas/externals/commons/j2ee/gnu-providers.jar diff --git a/jonas/jonas/externals/commons/j2ee/jacc-1_0.jar b/jonas/externals/commons/j2ee/jacc-1_0.jar similarity index 100% rename from jonas/jonas/externals/commons/j2ee/jacc-1_0.jar rename to jonas/externals/commons/j2ee/jacc-1_0.jar diff --git a/jonas/jonas/externals/commons/j2ee/javax77.jar b/jonas/externals/commons/j2ee/javax77.jar similarity index 100% rename from jonas/jonas/externals/commons/j2ee/javax77.jar rename to jonas/externals/commons/j2ee/javax77.jar diff --git a/jonas/jonas/externals/commons/j2ee/jaxr-api.jar b/jonas/externals/commons/j2ee/jaxr-api.jar similarity index 100% rename from jonas/jonas/externals/commons/j2ee/jaxr-api.jar rename to jonas/externals/commons/j2ee/jaxr-api.jar diff --git a/jonas/jonas/externals/commons/j2ee/jaxrpc.jar b/jonas/externals/commons/j2ee/jaxrpc.jar similarity index 100% rename from jonas/jonas/externals/commons/j2ee/jaxrpc.jar rename to jonas/externals/commons/j2ee/jaxrpc.jar diff --git a/jonas/jonas/externals/commons/j2ee/jms.jar b/jonas/externals/commons/j2ee/jms.jar similarity index 100% rename from jonas/jonas/externals/commons/j2ee/jms.jar rename to jonas/externals/commons/j2ee/jms.jar diff --git a/jonas/jonas/externals/commons/j2ee/jsp-2_0.jar b/jonas/externals/commons/j2ee/jsp-2_0.jar similarity index 100% rename from jonas/jonas/externals/commons/j2ee/jsp-2_0.jar rename to jonas/externals/commons/j2ee/jsp-2_0.jar diff --git a/jonas/jonas/externals/commons/j2ee/jsr88-api.jar b/jonas/externals/commons/j2ee/jsr88-api.jar similarity index 100% rename from jonas/jonas/externals/commons/j2ee/jsr88-api.jar rename to jonas/externals/commons/j2ee/jsr88-api.jar diff --git a/jonas/jonas/externals/commons/j2ee/jta-spec1_0_1.jar b/jonas/externals/commons/j2ee/jta-spec1_0_1.jar similarity index 100% rename from jonas/jonas/externals/commons/j2ee/jta-spec1_0_1.jar rename to jonas/externals/commons/j2ee/jta-spec1_0_1.jar diff --git a/jonas/jonas/externals/commons/j2ee/saaj.jar b/jonas/externals/commons/j2ee/saaj.jar similarity index 100% rename from jonas/jonas/externals/commons/j2ee/saaj.jar rename to jonas/externals/commons/j2ee/saaj.jar diff --git a/jonas/jonas/externals/commons/j2ee/servlet-2_4.jar b/jonas/externals/commons/j2ee/servlet-2_4.jar similarity index 100% rename from jonas/jonas/externals/commons/j2ee/servlet-2_4.jar rename to jonas/externals/commons/j2ee/servlet-2_4.jar diff --git a/jonas/jonas/externals/commons/j2ee/wsdl4j.jar b/jonas/externals/commons/j2ee/wsdl4j.jar similarity index 100% rename from jonas/jonas/externals/commons/j2ee/wsdl4j.jar rename to jonas/externals/commons/j2ee/wsdl4j.jar diff --git a/jonas/jonas/externals/commons/jonas/README b/jonas/externals/commons/jonas/README similarity index 100% rename from jonas/jonas/externals/commons/jonas/README rename to jonas/externals/commons/jonas/README diff --git a/jonas/jonas/externals/commons/jonas/asm/asm-1.5.3.jar b/jonas/externals/commons/jonas/asm/asm-1.5.3.jar similarity index 100% rename from jonas/jonas/externals/commons/jonas/asm/asm-1.5.3.jar rename to jonas/externals/commons/jonas/asm/asm-1.5.3.jar diff --git a/jonas/jonas/externals/commons/jonas/asm/asm-analysis-1.5.3.jar b/jonas/externals/commons/jonas/asm/asm-analysis-1.5.3.jar similarity index 100% rename from jonas/jonas/externals/commons/jonas/asm/asm-analysis-1.5.3.jar rename to jonas/externals/commons/jonas/asm/asm-analysis-1.5.3.jar diff --git a/jonas/jonas/externals/commons/jonas/asm/asm-attrs-1.5.3.jar b/jonas/externals/commons/jonas/asm/asm-attrs-1.5.3.jar similarity index 100% rename from jonas/jonas/externals/commons/jonas/asm/asm-attrs-1.5.3.jar rename to jonas/externals/commons/jonas/asm/asm-attrs-1.5.3.jar diff --git a/jonas/jonas/externals/commons/jonas/asm/asm-tree-1.5.3.jar b/jonas/externals/commons/jonas/asm/asm-tree-1.5.3.jar similarity index 100% rename from jonas/jonas/externals/commons/jonas/asm/asm-tree-1.5.3.jar rename to jonas/externals/commons/jonas/asm/asm-tree-1.5.3.jar diff --git a/jonas/jonas/externals/commons/jonas/asm/asm-util-1.5.3.jar b/jonas/externals/commons/jonas/asm/asm-util-1.5.3.jar similarity index 100% rename from jonas/jonas/externals/commons/jonas/asm/asm-util-1.5.3.jar rename to jonas/externals/commons/jonas/asm/asm-util-1.5.3.jar diff --git a/jonas/jonas/externals/commons/jonas/asm/asm-xml-1.5.3.jar b/jonas/externals/commons/jonas/asm/asm-xml-1.5.3.jar similarity index 100% rename from jonas/jonas/externals/commons/jonas/asm/asm-xml-1.5.3.jar rename to jonas/externals/commons/jonas/asm/asm-xml-1.5.3.jar diff --git a/jonas/jonas/externals/commons/jonas/asm/kasm-1.5.3.jar b/jonas/externals/commons/jonas/asm/kasm-1.5.3.jar similarity index 100% rename from jonas/jonas/externals/commons/jonas/asm/kasm-1.5.3.jar rename to jonas/externals/commons/jonas/asm/kasm-1.5.3.jar diff --git a/jonas/jonas/externals/commons/jonas/axis/README b/jonas/externals/commons/jonas/axis/README similarity index 100% rename from jonas/jonas/externals/commons/jonas/axis/README rename to jonas/externals/commons/jonas/axis/README diff --git a/jonas/jonas/externals/commons/jonas/axis/axis.jar b/jonas/externals/commons/jonas/axis/axis.jar similarity index 100% rename from jonas/jonas/externals/commons/jonas/axis/axis.jar rename to jonas/externals/commons/jonas/axis/axis.jar diff --git a/jonas/jonas/externals/commons/jonas/carol/README b/jonas/externals/commons/jonas/carol/README similarity index 100% rename from jonas/jonas/externals/commons/jonas/carol/README rename to jonas/externals/commons/jonas/carol/README diff --git a/jonas/jonas/externals/commons/jonas/carol/irmi.jar b/jonas/externals/commons/jonas/carol/irmi.jar similarity index 100% rename from jonas/jonas/externals/commons/jonas/carol/irmi.jar rename to jonas/externals/commons/jonas/carol/irmi.jar diff --git a/jonas/jonas/externals/commons/jonas/carol/jgroups-all.jar b/jonas/externals/commons/jonas/carol/jgroups-all.jar similarity index 100% rename from jonas/jonas/externals/commons/jonas/carol/jgroups-all.jar rename to jonas/externals/commons/jonas/carol/jgroups-all.jar diff --git a/jonas/jonas/externals/commons/jonas/carol/ow_carol.jar b/jonas/externals/commons/jonas/carol/ow_carol.jar similarity index 100% rename from jonas/jonas/externals/commons/jonas/carol/ow_carol.jar rename to jonas/externals/commons/jonas/carol/ow_carol.jar diff --git a/jonas/jonas/externals/commons/jonas/carol/ow_cmi.jar b/jonas/externals/commons/jonas/carol/ow_cmi.jar similarity index 100% rename from jonas/jonas/externals/commons/jonas/carol/ow_cmi.jar rename to jonas/externals/commons/jonas/carol/ow_cmi.jar diff --git a/jonas/jonas/externals/commons/jonas/concurrent.jar b/jonas/externals/commons/jonas/concurrent.jar similarity index 100% rename from jonas/jonas/externals/commons/jonas/concurrent.jar rename to jonas/externals/commons/jonas/concurrent.jar diff --git a/jonas/jonas/externals/commons/jonas/emb/README b/jonas/externals/commons/jonas/emb/README similarity index 100% rename from jonas/jonas/externals/commons/jonas/emb/README rename to jonas/externals/commons/jonas/emb/README diff --git a/jonas/jonas/externals/commons/jonas/emb/emb-core.ear b/jonas/externals/commons/jonas/emb/emb-core.ear similarity index 100% rename from jonas/jonas/externals/commons/jonas/emb/emb-core.ear rename to jonas/externals/commons/jonas/emb/emb-core.ear diff --git a/jonas/jonas/externals/commons/jonas/emb/emb-ow-mfb-core.jar b/jonas/externals/commons/jonas/emb/emb-ow-mfb-core.jar similarity index 100% rename from jonas/jonas/externals/commons/jonas/emb/emb-ow-mfb-core.jar rename to jonas/externals/commons/jonas/emb/emb-ow-mfb-core.jar diff --git a/jonas/jonas/externals/commons/jonas/emb/emb-ow-plugins-api.jar b/jonas/externals/commons/jonas/emb/emb-ow-plugins-api.jar similarity index 100% rename from jonas/jonas/externals/commons/jonas/emb/emb-ow-plugins-api.jar rename to jonas/externals/commons/jonas/emb/emb-ow-plugins-api.jar diff --git a/jonas/jonas/externals/commons/jonas/howl.jar b/jonas/externals/commons/jonas/howl.jar similarity index 100% rename from jonas/jonas/externals/commons/jonas/howl.jar rename to jonas/externals/commons/jonas/howl.jar diff --git a/jonas/jonas/externals/commons/jonas/hsqldb.jar b/jonas/externals/commons/jonas/hsqldb.jar similarity index 100% rename from jonas/jonas/externals/commons/jonas/hsqldb.jar rename to jonas/externals/commons/jonas/hsqldb.jar diff --git a/jonas/jonas/externals/commons/jonas/jakarta-commons/README b/jonas/externals/commons/jonas/jakarta-commons/README similarity index 100% rename from jonas/jonas/externals/commons/jonas/jakarta-commons/README rename to jonas/externals/commons/jonas/jakarta-commons/README diff --git a/jonas/jonas/externals/commons/jonas/jakarta-commons/commons-beanutils.jar b/jonas/externals/commons/jonas/jakarta-commons/commons-beanutils.jar similarity index 100% rename from jonas/jonas/externals/commons/jonas/jakarta-commons/commons-beanutils.jar rename to jonas/externals/commons/jonas/jakarta-commons/commons-beanutils.jar diff --git a/jonas/jonas/externals/commons/jonas/jakarta-commons/commons-codec.jar b/jonas/externals/commons/jonas/jakarta-commons/commons-codec.jar similarity index 100% rename from jonas/jonas/externals/commons/jonas/jakarta-commons/commons-codec.jar rename to jonas/externals/commons/jonas/jakarta-commons/commons-codec.jar diff --git a/jonas/jonas/externals/commons/jonas/jakarta-commons/commons-collections.jar b/jonas/externals/commons/jonas/jakarta-commons/commons-collections.jar similarity index 100% rename from jonas/jonas/externals/commons/jonas/jakarta-commons/commons-collections.jar rename to jonas/externals/commons/jonas/jakarta-commons/commons-collections.jar diff --git a/jonas/jonas/externals/commons/jonas/jakarta-commons/commons-discovery.jar b/jonas/externals/commons/jonas/jakarta-commons/commons-discovery.jar similarity index 100% rename from jonas/jonas/externals/commons/jonas/jakarta-commons/commons-discovery.jar rename to jonas/externals/commons/jonas/jakarta-commons/commons-discovery.jar diff --git a/jonas/jonas/externals/commons/jonas/jakarta-commons/commons-logging-api.jar b/jonas/externals/commons/jonas/jakarta-commons/commons-logging-api.jar similarity index 100% rename from jonas/jonas/externals/commons/jonas/jakarta-commons/commons-logging-api.jar rename to jonas/externals/commons/jonas/jakarta-commons/commons-logging-api.jar diff --git a/jonas/jonas/externals/commons/jonas/jakarta-commons/commons-modeler.jar b/jonas/externals/commons/jonas/jakarta-commons/commons-modeler.jar similarity index 100% rename from jonas/jonas/externals/commons/jonas/jakarta-commons/commons-modeler.jar rename to jonas/externals/commons/jonas/jakarta-commons/commons-modeler.jar diff --git a/jonas/jonas/externals/commons/jonas/jeremie/README b/jonas/externals/commons/jonas/jeremie/README similarity index 100% rename from jonas/jonas/externals/commons/jonas/jeremie/README rename to jonas/externals/commons/jonas/jeremie/README diff --git a/jonas/jonas/externals/commons/jonas/jeremie/jeremie.jar b/jonas/externals/commons/jonas/jeremie/jeremie.jar similarity index 100% rename from jonas/jonas/externals/commons/jonas/jeremie/jeremie.jar rename to jonas/externals/commons/jonas/jeremie/jeremie.jar diff --git a/jonas/jonas/externals/commons/jonas/jeremie/jonathan-core.jar b/jonas/externals/commons/jonas/jeremie/jonathan-core.jar similarity index 100% rename from jonas/jonas/externals/commons/jonas/jeremie/jonathan-core.jar rename to jonas/externals/commons/jonas/jeremie/jonathan-core.jar diff --git a/jonas/jonas/externals/commons/jonas/jeremie/kilim.jar b/jonas/externals/commons/jonas/jeremie/kilim.jar similarity index 100% rename from jonas/jonas/externals/commons/jonas/jeremie/kilim.jar rename to jonas/externals/commons/jonas/jeremie/kilim.jar diff --git a/jonas/jonas/externals/commons/jonas/jeremie/nanoxml-lite-2.2.1.jar b/jonas/externals/commons/jonas/jeremie/nanoxml-lite-2.2.1.jar similarity index 100% rename from jonas/jonas/externals/commons/jonas/jeremie/nanoxml-lite-2.2.1.jar rename to jonas/externals/commons/jonas/jeremie/nanoxml-lite-2.2.1.jar diff --git a/jonas/jonas/externals/commons/jonas/joram/JCup.jar b/jonas/externals/commons/jonas/joram/JCup.jar similarity index 100% rename from jonas/jonas/externals/commons/jonas/joram/JCup.jar rename to jonas/externals/commons/jonas/joram/JCup.jar diff --git a/jonas/jonas/externals/commons/jonas/joram/README b/jonas/externals/commons/jonas/joram/README similarity index 100% rename from jonas/jonas/externals/commons/jonas/joram/README rename to jonas/externals/commons/jonas/joram/README diff --git a/jonas/jonas/externals/commons/jonas/joram/jakarta-regexp-1.2.jar b/jonas/externals/commons/jonas/joram/jakarta-regexp-1.2.jar similarity index 100% rename from jonas/jonas/externals/commons/jonas/joram/jakarta-regexp-1.2.jar rename to jonas/externals/commons/jonas/joram/jakarta-regexp-1.2.jar diff --git a/jonas/jonas/externals/commons/jonas/joram/joram-client.jar b/jonas/externals/commons/jonas/joram/joram-client.jar similarity index 100% rename from jonas/jonas/externals/commons/jonas/joram/joram-client.jar rename to jonas/externals/commons/jonas/joram/joram-client.jar diff --git a/jonas/jonas/externals/commons/jonas/joram/joram-connector.jar b/jonas/externals/commons/jonas/joram/joram-connector.jar similarity index 100% rename from jonas/jonas/externals/commons/jonas/joram/joram-connector.jar rename to jonas/externals/commons/jonas/joram/joram-connector.jar diff --git a/jonas/jonas/externals/commons/jonas/joram/joram-mom.jar b/jonas/externals/commons/jonas/joram/joram-mom.jar similarity index 100% rename from jonas/jonas/externals/commons/jonas/joram/joram-mom.jar rename to jonas/externals/commons/jonas/joram/joram-mom.jar diff --git a/jonas/jonas/externals/commons/jonas/joram/joram-raconfig.jar b/jonas/externals/commons/jonas/joram/joram-raconfig.jar similarity index 100% rename from jonas/jonas/externals/commons/jonas/joram/joram-raconfig.jar rename to jonas/externals/commons/jonas/joram/joram-raconfig.jar diff --git a/jonas/jonas/externals/commons/jonas/joram/joram-shared.jar b/jonas/externals/commons/jonas/joram/joram-shared.jar similarity index 100% rename from jonas/jonas/externals/commons/jonas/joram/joram-shared.jar rename to jonas/externals/commons/jonas/joram/joram-shared.jar diff --git a/jonas/jonas/externals/commons/jonas/joram/joram_for_jonas_ra.rar b/jonas/externals/commons/jonas/joram/joram_for_jonas_ra.rar similarity index 100% rename from jonas/jonas/externals/commons/jonas/joram/joram_for_jonas_ra.rar rename to jonas/externals/commons/jonas/joram/joram_for_jonas_ra.rar diff --git a/jonas/jonas/externals/commons/jonas/jorm/README b/jonas/externals/commons/jonas/jorm/README similarity index 100% rename from jonas/jonas/externals/commons/jonas/jorm/README rename to jonas/externals/commons/jonas/jorm/README diff --git a/jonas/jonas/externals/commons/jonas/jorm/ow_jorm_api.jar b/jonas/externals/commons/jonas/jorm/ow_jorm_api.jar similarity index 100% rename from jonas/jonas/externals/commons/jonas/jorm/ow_jorm_api.jar rename to jonas/externals/commons/jonas/jorm/ow_jorm_api.jar diff --git a/jonas/jonas/externals/commons/jonas/jorm/ow_jorm_core.jar b/jonas/externals/commons/jonas/jorm/ow_jorm_core.jar similarity index 100% rename from jonas/jonas/externals/commons/jonas/jorm/ow_jorm_core.jar rename to jonas/externals/commons/jonas/jorm/ow_jorm_core.jar diff --git a/jonas/jonas/externals/commons/jonas/jorm/ow_jorm_rdb_adapter.jar b/jonas/externals/commons/jonas/jorm/ow_jorm_rdb_adapter.jar similarity index 100% rename from jonas/jonas/externals/commons/jonas/jorm/ow_jorm_rdb_adapter.jar rename to jonas/externals/commons/jonas/jorm/ow_jorm_rdb_adapter.jar diff --git a/jonas/jonas/externals/commons/jonas/jorm/ow_jorm_runtime.jar b/jonas/externals/commons/jonas/jorm/ow_jorm_runtime.jar similarity index 100% rename from jonas/jonas/externals/commons/jonas/jorm/ow_jorm_runtime.jar rename to jonas/externals/commons/jonas/jorm/ow_jorm_runtime.jar diff --git a/jonas/jonas/externals/commons/jonas/jotm.jar b/jonas/externals/commons/jonas/jotm.jar similarity index 100% rename from jonas/jonas/externals/commons/jonas/jotm.jar rename to jonas/externals/commons/jonas/jotm.jar diff --git a/jonas/jonas/externals/commons/jonas/medor/README b/jonas/externals/commons/jonas/medor/README similarity index 100% rename from jonas/jonas/externals/commons/jonas/medor/README rename to jonas/externals/commons/jonas/medor/README diff --git a/jonas/jonas/externals/commons/jonas/medor/ow_medor.jar b/jonas/externals/commons/jonas/medor/ow_medor.jar similarity index 100% rename from jonas/jonas/externals/commons/jonas/medor/ow_medor.jar rename to jonas/externals/commons/jonas/medor/ow_medor.jar diff --git a/jonas/jonas/externals/commons/jonas/medor/ow_medor_exp.jar b/jonas/externals/commons/jonas/medor/ow_medor_exp.jar similarity index 100% rename from jonas/jonas/externals/commons/jonas/medor/ow_medor_exp.jar rename to jonas/externals/commons/jonas/medor/ow_medor_exp.jar diff --git a/jonas/jonas/externals/commons/jonas/monolog/README b/jonas/externals/commons/jonas/monolog/README similarity index 100% rename from jonas/jonas/externals/commons/jonas/monolog/README rename to jonas/externals/commons/jonas/monolog/README diff --git a/jonas/jonas/externals/commons/jonas/monolog/ow_util_log_api.jar b/jonas/externals/commons/jonas/monolog/ow_util_log_api.jar similarity index 100% rename from jonas/jonas/externals/commons/jonas/monolog/ow_util_log_api.jar rename to jonas/externals/commons/jonas/monolog/ow_util_log_api.jar diff --git a/jonas/jonas/externals/commons/jonas/monolog/ow_util_log_file.jar b/jonas/externals/commons/jonas/monolog/ow_util_log_file.jar similarity index 100% rename from jonas/jonas/externals/commons/jonas/monolog/ow_util_log_file.jar rename to jonas/externals/commons/jonas/monolog/ow_util_log_file.jar diff --git a/jonas/jonas/externals/commons/jonas/monolog/ow_util_log_helper.jar b/jonas/externals/commons/jonas/monolog/ow_util_log_helper.jar similarity index 100% rename from jonas/jonas/externals/commons/jonas/monolog/ow_util_log_helper.jar rename to jonas/externals/commons/jonas/monolog/ow_util_log_helper.jar diff --git a/jonas/jonas/externals/commons/jonas/monolog/ow_util_log_remote.jar b/jonas/externals/commons/jonas/monolog/ow_util_log_remote.jar similarity index 100% rename from jonas/jonas/externals/commons/jonas/monolog/ow_util_log_remote.jar rename to jonas/externals/commons/jonas/monolog/ow_util_log_remote.jar diff --git a/jonas/jonas/externals/commons/jonas/monolog/ow_util_log_wrp_common.jar b/jonas/externals/commons/jonas/monolog/ow_util_log_wrp_common.jar similarity index 100% rename from jonas/jonas/externals/commons/jonas/monolog/ow_util_log_wrp_common.jar rename to jonas/externals/commons/jonas/monolog/ow_util_log_wrp_common.jar diff --git a/jonas/jonas/externals/commons/jonas/monolog/ow_util_log_wrp_javalog.jar b/jonas/externals/commons/jonas/monolog/ow_util_log_wrp_javalog.jar similarity index 100% rename from jonas/jonas/externals/commons/jonas/monolog/ow_util_log_wrp_javalog.jar rename to jonas/externals/commons/jonas/monolog/ow_util_log_wrp_javalog.jar diff --git a/jonas/jonas/externals/commons/jonas/monolog/ow_util_log_wrp_log4j.jar b/jonas/externals/commons/jonas/monolog/ow_util_log_wrp_log4j.jar similarity index 100% rename from jonas/jonas/externals/commons/jonas/monolog/ow_util_log_wrp_log4j.jar rename to jonas/externals/commons/jonas/monolog/ow_util_log_wrp_log4j.jar diff --git a/jonas/jonas/externals/commons/jonas/monolog/ow_util_log_wrp_p6spy.jar b/jonas/externals/commons/jonas/monolog/ow_util_log_wrp_p6spy.jar similarity index 100% rename from jonas/jonas/externals/commons/jonas/monolog/ow_util_log_wrp_p6spy.jar rename to jonas/externals/commons/jonas/monolog/ow_util_log_wrp_p6spy.jar diff --git a/jonas/jonas/externals/commons/jonas/monolog/ow_util_log_wrp_pw.jar b/jonas/externals/commons/jonas/monolog/ow_util_log_wrp_pw.jar similarity index 100% rename from jonas/jonas/externals/commons/jonas/monolog/ow_util_log_wrp_pw.jar rename to jonas/externals/commons/jonas/monolog/ow_util_log_wrp_pw.jar diff --git a/jonas/jonas/externals/commons/jonas/mx4j/README b/jonas/externals/commons/jonas/mx4j/README similarity index 100% rename from jonas/jonas/externals/commons/jonas/mx4j/README rename to jonas/externals/commons/jonas/mx4j/README diff --git a/jonas/jonas/externals/commons/jonas/mx4j/mx4j-remote.jar b/jonas/externals/commons/jonas/mx4j/mx4j-remote.jar similarity index 100% rename from jonas/jonas/externals/commons/jonas/mx4j/mx4j-remote.jar rename to jonas/externals/commons/jonas/mx4j/mx4j-remote.jar diff --git a/jonas/jonas/externals/commons/jonas/mx4j/mx4j-tools.jar b/jonas/externals/commons/jonas/mx4j/mx4j-tools.jar similarity index 100% rename from jonas/jonas/externals/commons/jonas/mx4j/mx4j-tools.jar rename to jonas/externals/commons/jonas/mx4j/mx4j-tools.jar diff --git a/jonas/jonas/externals/commons/jonas/mx4j/mx4j.jar b/jonas/externals/commons/jonas/mx4j/mx4j.jar similarity index 100% rename from jonas/jonas/externals/commons/jonas/mx4j/mx4j.jar rename to jonas/externals/commons/jonas/mx4j/mx4j.jar diff --git a/jonas/jonas/externals/commons/jonas/p6spy.jar b/jonas/externals/commons/jonas/p6spy.jar similarity index 100% rename from jonas/jonas/externals/commons/jonas/p6spy.jar rename to jonas/externals/commons/jonas/p6spy.jar diff --git a/jonas/jonas/externals/commons/jonas/perseus/ow_perseus_cache.jar b/jonas/externals/commons/jonas/perseus/ow_perseus_cache.jar similarity index 100% rename from jonas/jonas/externals/commons/jonas/perseus/ow_perseus_cache.jar rename to jonas/externals/commons/jonas/perseus/ow_perseus_cache.jar diff --git a/jonas/jonas/externals/commons/jonas/perseus/ow_perseus_concurrency.jar b/jonas/externals/commons/jonas/perseus/ow_perseus_concurrency.jar similarity index 100% rename from jonas/jonas/externals/commons/jonas/perseus/ow_perseus_concurrency.jar rename to jonas/externals/commons/jonas/perseus/ow_perseus_concurrency.jar diff --git a/jonas/jonas/externals/commons/jonas/perseus/ow_perseus_dependency.jar b/jonas/externals/commons/jonas/perseus/ow_perseus_dependency.jar similarity index 100% rename from jonas/jonas/externals/commons/jonas/perseus/ow_perseus_dependency.jar rename to jonas/externals/commons/jonas/perseus/ow_perseus_dependency.jar diff --git a/jonas/jonas/externals/commons/jonas/perseus/ow_perseus_persistence.jar b/jonas/externals/commons/jonas/perseus/ow_perseus_persistence.jar similarity index 100% rename from jonas/jonas/externals/commons/jonas/perseus/ow_perseus_persistence.jar rename to jonas/externals/commons/jonas/perseus/ow_perseus_persistence.jar diff --git a/jonas/jonas/externals/commons/jonas/perseus/ow_perseus_pool.jar b/jonas/externals/commons/jonas/perseus/ow_perseus_pool.jar similarity index 100% rename from jonas/jonas/externals/commons/jonas/perseus/ow_perseus_pool.jar rename to jonas/externals/commons/jonas/perseus/ow_perseus_pool.jar diff --git a/jonas/jonas/externals/commons/jonas/speedo/README b/jonas/externals/commons/jonas/speedo/README similarity index 100% rename from jonas/jonas/externals/commons/jonas/speedo/README rename to jonas/externals/commons/jonas/speedo/README diff --git a/jonas/jonas/externals/commons/jonas/speedo/jdo2.jar b/jonas/externals/commons/jonas/speedo/jdo2.jar similarity index 100% rename from jonas/jonas/externals/commons/jonas/speedo/jdo2.jar rename to jonas/externals/commons/jonas/speedo/jdo2.jar diff --git a/jonas/jonas/externals/commons/jonas/speedo/speedo-jdo.properties b/jonas/externals/commons/jonas/speedo/speedo-jdo.properties similarity index 100% rename from jonas/jonas/externals/commons/jonas/speedo/speedo-jdo.properties rename to jonas/externals/commons/jonas/speedo/speedo-jdo.properties diff --git a/jonas/jonas/externals/commons/jonas/speedo/speedo-jdo_client.jar b/jonas/externals/commons/jonas/speedo/speedo-jdo_client.jar similarity index 100% rename from jonas/jonas/externals/commons/jonas/speedo/speedo-jdo_client.jar rename to jonas/externals/commons/jonas/speedo/speedo-jdo_client.jar diff --git a/jonas/jonas/externals/commons/jonas/speedo/speedo-jdo_for_jonas_ra.jar b/jonas/externals/commons/jonas/speedo/speedo-jdo_for_jonas_ra.jar similarity index 100% rename from jonas/jonas/externals/commons/jonas/speedo/speedo-jdo_for_jonas_ra.jar rename to jonas/externals/commons/jonas/speedo/speedo-jdo_for_jonas_ra.jar diff --git a/jonas/jonas/externals/commons/jonas/speedo/speedo-jdo_for_jonas_ra.rar b/jonas/externals/commons/jonas/speedo/speedo-jdo_for_jonas_ra.rar similarity index 100% rename from jonas/jonas/externals/commons/jonas/speedo/speedo-jdo_for_jonas_ra.rar rename to jonas/externals/commons/jonas/speedo/speedo-jdo_for_jonas_ra.rar diff --git a/jonas/jonas/externals/commons/jonas/speedo/speedo_client.jar b/jonas/externals/commons/jonas/speedo/speedo_client.jar similarity index 100% rename from jonas/jonas/externals/commons/jonas/speedo/speedo_client.jar rename to jonas/externals/commons/jonas/speedo/speedo_client.jar diff --git a/jonas/jonas/externals/commons/jonas/ws-security/addressing.jar b/jonas/externals/commons/jonas/ws-security/addressing.jar similarity index 100% rename from jonas/jonas/externals/commons/jonas/ws-security/addressing.jar rename to jonas/externals/commons/jonas/ws-security/addressing.jar diff --git a/jonas/jonas/externals/commons/jonas/ws-security/opensaml.jar b/jonas/externals/commons/jonas/ws-security/opensaml.jar similarity index 100% rename from jonas/jonas/externals/commons/jonas/ws-security/opensaml.jar rename to jonas/externals/commons/jonas/ws-security/opensaml.jar diff --git a/jonas/jonas/externals/commons/jonas/ws-security/wss4j.jar b/jonas/externals/commons/jonas/ws-security/wss4j.jar similarity index 100% rename from jonas/jonas/externals/commons/jonas/ws-security/wss4j.jar rename to jonas/externals/commons/jonas/ws-security/wss4j.jar diff --git a/jonas/jonas/externals/commons/jonas/ws-security/xmlsec.jar b/jonas/externals/commons/jonas/ws-security/xmlsec.jar similarity index 100% rename from jonas/jonas/externals/commons/jonas/ws-security/xmlsec.jar rename to jonas/externals/commons/jonas/ws-security/xmlsec.jar diff --git a/jonas/jonas/externals/endorsed/README b/jonas/externals/endorsed/README similarity index 100% rename from jonas/jonas/externals/endorsed/README rename to jonas/externals/endorsed/README diff --git a/jonas/jonas/externals/endorsed/avalon-framework-4.1.5.jar b/jonas/externals/endorsed/avalon-framework-4.1.5.jar similarity index 100% rename from jonas/jonas/externals/endorsed/avalon-framework-4.1.5.jar rename to jonas/externals/endorsed/avalon-framework-4.1.5.jar diff --git a/jonas/jonas/externals/endorsed/gnu-crypto-sasl-jdk1.4.jar b/jonas/externals/endorsed/gnu-crypto-sasl-jdk1.4.jar similarity index 100% rename from jonas/jonas/externals/endorsed/gnu-crypto-sasl-jdk1.4.jar rename to jonas/externals/endorsed/gnu-crypto-sasl-jdk1.4.jar diff --git a/jonas/jonas/externals/endorsed/idl.jar b/jonas/externals/endorsed/idl.jar similarity index 100% rename from jonas/jonas/externals/endorsed/idl.jar rename to jonas/externals/endorsed/idl.jar diff --git a/jonas/jonas/externals/endorsed/jacorb.jar b/jonas/externals/endorsed/jacorb.jar similarity index 100% rename from jonas/jonas/externals/endorsed/jacorb.jar rename to jonas/externals/endorsed/jacorb.jar diff --git a/jonas/jonas/externals/endorsed/logkit-1.2.jar b/jonas/externals/endorsed/logkit-1.2.jar similarity index 100% rename from jonas/jonas/externals/endorsed/logkit-1.2.jar rename to jonas/externals/endorsed/logkit-1.2.jar diff --git a/jonas/jonas/externals/endorsed/ow_carol_iiop_delegate.jar b/jonas/externals/endorsed/ow_carol_iiop_delegate.jar similarity index 100% rename from jonas/jonas/externals/endorsed/ow_carol_iiop_delegate.jar rename to jonas/externals/endorsed/ow_carol_iiop_delegate.jar diff --git a/jonas/jonas/externals/endorsed/xalan-j2-2.6.0.jar b/jonas/externals/endorsed/xalan-j2-2.6.0.jar similarity index 100% rename from jonas/jonas/externals/endorsed/xalan-j2-2.6.0.jar rename to jonas/externals/endorsed/xalan-j2-2.6.0.jar diff --git a/jonas/jonas/externals/endorsed/xercesImpl.jar b/jonas/externals/endorsed/xercesImpl.jar similarity index 100% rename from jonas/jonas/externals/endorsed/xercesImpl.jar rename to jonas/externals/endorsed/xercesImpl.jar diff --git a/jonas/jonas/externals/endorsed/xml-apis.jar b/jonas/externals/endorsed/xml-apis.jar similarity index 100% rename from jonas/jonas/externals/endorsed/xml-apis.jar rename to jonas/externals/endorsed/xml-apis.jar diff --git a/jonas/jonas/externals/examples/README b/jonas/externals/examples/README similarity index 100% rename from jonas/jonas/externals/examples/README rename to jonas/externals/examples/README diff --git a/jonas/jonas/externals/examples/commons-validator.jar b/jonas/externals/examples/commons-validator.jar similarity index 100% rename from jonas/jonas/externals/examples/commons-validator.jar rename to jonas/externals/examples/commons-validator.jar diff --git a/jonas/jonas/externals/examples/hibernate/antlr-2.7.6rc1.jar b/jonas/externals/examples/hibernate/antlr-2.7.6rc1.jar similarity index 100% rename from jonas/jonas/externals/examples/hibernate/antlr-2.7.6rc1.jar rename to jonas/externals/examples/hibernate/antlr-2.7.6rc1.jar diff --git a/jonas/jonas/externals/examples/hibernate/c3p0-0.9.0.jar b/jonas/externals/examples/hibernate/c3p0-0.9.0.jar similarity index 100% rename from jonas/jonas/externals/examples/hibernate/c3p0-0.9.0.jar rename to jonas/externals/examples/hibernate/c3p0-0.9.0.jar diff --git a/jonas/jonas/externals/examples/hibernate/cglib-2.1.3.jar b/jonas/externals/examples/hibernate/cglib-2.1.3.jar similarity index 100% rename from jonas/jonas/externals/examples/hibernate/cglib-2.1.3.jar rename to jonas/externals/examples/hibernate/cglib-2.1.3.jar diff --git a/jonas/jonas/externals/examples/hibernate/cglib-nodep-2.1_3.jar b/jonas/externals/examples/hibernate/cglib-nodep-2.1_3.jar similarity index 100% rename from jonas/jonas/externals/examples/hibernate/cglib-nodep-2.1_3.jar rename to jonas/externals/examples/hibernate/cglib-nodep-2.1_3.jar diff --git a/jonas/jonas/externals/examples/hibernate/dom4j-1.6.1.jar b/jonas/externals/examples/hibernate/dom4j-1.6.1.jar similarity index 100% rename from jonas/jonas/externals/examples/hibernate/dom4j-1.6.1.jar rename to jonas/externals/examples/hibernate/dom4j-1.6.1.jar diff --git a/jonas/jonas/externals/examples/hibernate/ehcache-1.1.jar b/jonas/externals/examples/hibernate/ehcache-1.1.jar similarity index 100% rename from jonas/jonas/externals/examples/hibernate/ehcache-1.1.jar rename to jonas/externals/examples/hibernate/ehcache-1.1.jar diff --git a/jonas/jonas/externals/examples/hibernate/hibernate-3.1.2.jar b/jonas/externals/examples/hibernate/hibernate-3.1.2.jar similarity index 100% rename from jonas/jonas/externals/examples/hibernate/hibernate-3.1.2.jar rename to jonas/externals/examples/hibernate/hibernate-3.1.2.jar diff --git a/jonas/jonas/externals/examples/hibernate/jaxen-1.1-beta-7.jar b/jonas/externals/examples/hibernate/jaxen-1.1-beta-7.jar similarity index 100% rename from jonas/jonas/externals/examples/hibernate/jaxen-1.1-beta-7.jar rename to jonas/externals/examples/hibernate/jaxen-1.1-beta-7.jar diff --git a/jonas/jonas/externals/examples/hibernate/oscache-2.1.jar b/jonas/externals/examples/hibernate/oscache-2.1.jar similarity index 100% rename from jonas/jonas/externals/examples/hibernate/oscache-2.1.jar rename to jonas/externals/examples/hibernate/oscache-2.1.jar diff --git a/jonas/jonas/externals/examples/hibernate/proxool-0.8.3.jar b/jonas/externals/examples/hibernate/proxool-0.8.3.jar similarity index 100% rename from jonas/jonas/externals/examples/hibernate/proxool-0.8.3.jar rename to jonas/externals/examples/hibernate/proxool-0.8.3.jar diff --git a/jonas/jonas/externals/examples/hibernate/swarmcache-1.0rc2.jar b/jonas/externals/examples/hibernate/swarmcache-1.0rc2.jar similarity index 100% rename from jonas/jonas/externals/examples/hibernate/swarmcache-1.0rc2.jar rename to jonas/externals/examples/hibernate/swarmcache-1.0rc2.jar diff --git a/jonas/jonas/externals/examples/hibernate/versioncheck.jar b/jonas/externals/examples/hibernate/versioncheck.jar similarity index 100% rename from jonas/jonas/externals/examples/hibernate/versioncheck.jar rename to jonas/externals/examples/hibernate/versioncheck.jar diff --git a/jonas/jonas/externals/examples/jakarta-taglibs-core-1.1.1.jar b/jonas/externals/examples/jakarta-taglibs-core-1.1.1.jar similarity index 100% rename from jonas/jonas/externals/examples/jakarta-taglibs-core-1.1.1.jar rename to jonas/externals/examples/jakarta-taglibs-core-1.1.1.jar diff --git a/jonas/jonas/externals/examples/jakarta-taglibs-standard-1.1.1.jar b/jonas/externals/examples/jakarta-taglibs-standard-1.1.1.jar similarity index 100% rename from jonas/jonas/externals/examples/jakarta-taglibs-standard-1.1.1.jar rename to jonas/externals/examples/jakarta-taglibs-standard-1.1.1.jar diff --git a/jonas/jonas/externals/examples/oro-2.0.8.jar b/jonas/externals/examples/oro-2.0.8.jar similarity index 100% rename from jonas/jonas/externals/examples/oro-2.0.8.jar rename to jonas/externals/examples/oro-2.0.8.jar diff --git a/jonas/jonas/externals/examples/spring/spring-aop.jar b/jonas/externals/examples/spring/spring-aop.jar similarity index 100% rename from jonas/jonas/externals/examples/spring/spring-aop.jar rename to jonas/externals/examples/spring/spring-aop.jar diff --git a/jonas/jonas/externals/examples/spring/spring-beans.jar b/jonas/externals/examples/spring/spring-beans.jar similarity index 100% rename from jonas/jonas/externals/examples/spring/spring-beans.jar rename to jonas/externals/examples/spring/spring-beans.jar diff --git a/jonas/jonas/externals/examples/spring/spring-context.jar b/jonas/externals/examples/spring/spring-context.jar similarity index 100% rename from jonas/jonas/externals/examples/spring/spring-context.jar rename to jonas/externals/examples/spring/spring-context.jar diff --git a/jonas/jonas/externals/examples/spring/spring-core.jar b/jonas/externals/examples/spring/spring-core.jar similarity index 100% rename from jonas/jonas/externals/examples/spring/spring-core.jar rename to jonas/externals/examples/spring/spring-core.jar diff --git a/jonas/jonas/externals/examples/spring/spring-remoting.jar b/jonas/externals/examples/spring/spring-remoting.jar similarity index 100% rename from jonas/jonas/externals/examples/spring/spring-remoting.jar rename to jonas/externals/examples/spring/spring-remoting.jar diff --git a/jonas/jonas/externals/examples/spring/spring-web.jar b/jonas/externals/examples/spring/spring-web.jar similarity index 100% rename from jonas/jonas/externals/examples/spring/spring-web.jar rename to jonas/externals/examples/spring/spring-web.jar diff --git a/jonas/jonas/externals/examples/spring/spring-webmvc.jar b/jonas/externals/examples/spring/spring-webmvc.jar similarity index 100% rename from jonas/jonas/externals/examples/spring/spring-webmvc.jar rename to jonas/externals/examples/spring/spring-webmvc.jar diff --git a/jonas/jonas/externals/examples/xdoclet-1.2.2.jar b/jonas/externals/examples/xdoclet-1.2.2.jar similarity index 100% rename from jonas/jonas/externals/examples/xdoclet-1.2.2.jar rename to jonas/externals/examples/xdoclet-1.2.2.jar diff --git a/jonas/jonas/externals/examples/xdoclet-apache-module-1.2.2.jar b/jonas/externals/examples/xdoclet-apache-module-1.2.2.jar similarity index 100% rename from jonas/jonas/externals/examples/xdoclet-apache-module-1.2.2.jar rename to jonas/externals/examples/xdoclet-apache-module-1.2.2.jar diff --git a/jonas/jonas/externals/examples/xdoclet-ejb-module-1.2.2.jar b/jonas/externals/examples/xdoclet-ejb-module-1.2.2.jar similarity index 100% rename from jonas/jonas/externals/examples/xdoclet-ejb-module-1.2.2.jar rename to jonas/externals/examples/xdoclet-ejb-module-1.2.2.jar diff --git a/jonas/jonas/externals/examples/xdoclet-exolab-module-1.2.2.jar b/jonas/externals/examples/xdoclet-exolab-module-1.2.2.jar similarity index 100% rename from jonas/jonas/externals/examples/xdoclet-exolab-module-1.2.2.jar rename to jonas/externals/examples/xdoclet-exolab-module-1.2.2.jar diff --git a/jonas/jonas/externals/examples/xdoclet-objectweb-module-1.2.2.jar b/jonas/externals/examples/xdoclet-objectweb-module-1.2.2.jar similarity index 100% rename from jonas/jonas/externals/examples/xdoclet-objectweb-module-1.2.2.jar rename to jonas/externals/examples/xdoclet-objectweb-module-1.2.2.jar diff --git a/jonas/jonas/externals/examples/xdoclet-web-module-1.2.2.jar b/jonas/externals/examples/xdoclet-web-module-1.2.2.jar similarity index 100% rename from jonas/jonas/externals/examples/xdoclet-web-module-1.2.2.jar rename to jonas/externals/examples/xdoclet-web-module-1.2.2.jar diff --git a/jonas/jonas/externals/examples/xjavadoc-1.1.jar b/jonas/externals/examples/xjavadoc-1.1.jar similarity index 100% rename from jonas/jonas/externals/examples/xjavadoc-1.1.jar rename to jonas/externals/examples/xjavadoc-1.1.jar diff --git a/jonas/jonas/externals/fdf/README b/jonas/externals/fdf/README similarity index 100% rename from jonas/jonas/externals/fdf/README rename to jonas/externals/fdf/README diff --git a/jonas/jonas/externals/fdf/ant-jsch.jar b/jonas/externals/fdf/ant-jsch.jar similarity index 100% rename from jonas/jonas/externals/fdf/ant-jsch.jar rename to jonas/externals/fdf/ant-jsch.jar diff --git a/jonas/jonas/externals/fdf/asm-2.0.jar b/jonas/externals/fdf/asm-2.0.jar similarity index 100% rename from jonas/jonas/externals/fdf/asm-2.0.jar rename to jonas/externals/fdf/asm-2.0.jar diff --git a/jonas/jonas/externals/fdf/commons-httpclient-3.0.jar b/jonas/externals/fdf/commons-httpclient-3.0.jar similarity index 100% rename from jonas/jonas/externals/fdf/commons-httpclient-3.0.jar rename to jonas/externals/fdf/commons-httpclient-3.0.jar diff --git a/jonas/jonas/externals/fdf/commons-net-1.4.1.jar b/jonas/externals/fdf/commons-net-1.4.1.jar similarity index 100% rename from jonas/jonas/externals/fdf/commons-net-1.4.1.jar rename to jonas/externals/fdf/commons-net-1.4.1.jar diff --git a/jonas/jonas/externals/fdf/dtdparser121.jar b/jonas/externals/fdf/dtdparser121.jar similarity index 100% rename from jonas/jonas/externals/fdf/dtdparser121.jar rename to jonas/externals/fdf/dtdparser121.jar diff --git a/jonas/jonas/externals/fdf/fdf.jar b/jonas/externals/fdf/fdf.jar similarity index 100% rename from jonas/jonas/externals/fdf/fdf.jar rename to jonas/externals/fdf/fdf.jar diff --git a/jonas/jonas/externals/fdf/fractal-adl.jar b/jonas/externals/fdf/fractal-adl.jar similarity index 100% rename from jonas/jonas/externals/fdf/fractal-adl.jar rename to jonas/externals/fdf/fractal-adl.jar diff --git a/jonas/jonas/externals/fdf/fractal.jar b/jonas/externals/fdf/fractal.jar similarity index 100% rename from jonas/jonas/externals/fdf/fractal.jar rename to jonas/externals/fdf/fractal.jar diff --git a/jonas/jonas/externals/fdf/ganymed-ssh2-build209.jar b/jonas/externals/fdf/ganymed-ssh2-build209.jar similarity index 100% rename from jonas/jonas/externals/fdf/ganymed-ssh2-build209.jar rename to jonas/externals/fdf/ganymed-ssh2-build209.jar diff --git a/jonas/jonas/externals/fdf/jsch-0.1.26.jar b/jonas/externals/fdf/jsch-0.1.26.jar similarity index 100% rename from jonas/jonas/externals/fdf/jsch-0.1.26.jar rename to jonas/externals/fdf/jsch-0.1.26.jar diff --git a/jonas/jonas/externals/fdf/julia-asm-2.0.3.jar b/jonas/externals/fdf/julia-asm-2.0.3.jar similarity index 100% rename from jonas/jonas/externals/fdf/julia-asm-2.0.3.jar rename to jonas/externals/fdf/julia-asm-2.0.3.jar diff --git a/jonas/jonas/externals/fdf/julia-mixins-2.0.3.jar b/jonas/externals/fdf/julia-mixins-2.0.3.jar similarity index 100% rename from jonas/jonas/externals/fdf/julia-mixins-2.0.3.jar rename to jonas/externals/fdf/julia-mixins-2.0.3.jar diff --git a/jonas/jonas/externals/fdf/julia-runtime-2.0.3.jar b/jonas/externals/fdf/julia-runtime-2.0.3.jar similarity index 100% rename from jonas/jonas/externals/fdf/julia-runtime-2.0.3.jar rename to jonas/externals/fdf/julia-runtime-2.0.3.jar diff --git a/jonas/jonas/externals/fdf/ow_deployment_scheduling.jar b/jonas/externals/fdf/ow_deployment_scheduling.jar similarity index 100% rename from jonas/jonas/externals/fdf/ow_deployment_scheduling.jar rename to jonas/externals/fdf/ow_deployment_scheduling.jar diff --git a/jonas/jonas/externals/ishmael.jar b/jonas/externals/ishmael.jar similarity index 100% rename from jonas/jonas/externals/ishmael.jar rename to jonas/externals/ishmael.jar diff --git a/jonas/jonas/externals/jonasAdmin/README b/jonas/externals/jonasAdmin/README similarity index 100% rename from jonas/jonas/externals/jonasAdmin/README rename to jonas/externals/jonasAdmin/README diff --git a/jonas/jonas/externals/jonasAdmin/commons-fileupload.jar b/jonas/externals/jonasAdmin/commons-fileupload.jar similarity index 100% rename from jonas/jonas/externals/jonasAdmin/commons-fileupload.jar rename to jonas/externals/jonasAdmin/commons-fileupload.jar diff --git a/jonas/jonas/externals/jonasAdmin/commons-io.jar b/jonas/externals/jonasAdmin/commons-io.jar similarity index 100% rename from jonas/jonas/externals/jonasAdmin/commons-io.jar rename to jonas/externals/jonasAdmin/commons-io.jar diff --git a/jonas/jonas/externals/jonasAdmin/struts.jar b/jonas/externals/jonasAdmin/struts.jar similarity index 100% rename from jonas/jonas/externals/jonasAdmin/struts.jar rename to jonas/externals/jonasAdmin/struts.jar diff --git a/jonas/jonas/externals/jonasAdmin/wsabi4j2ee-core-1.0.jar b/jonas/externals/jonasAdmin/wsabi4j2ee-core-1.0.jar similarity index 100% rename from jonas/jonas/externals/jonasAdmin/wsabi4j2ee-core-1.0.jar rename to jonas/externals/jonasAdmin/wsabi4j2ee-core-1.0.jar diff --git a/jonas/jonas/externals/jonasAdmin/wsabi4j2ee-jonas-1.0.jar b/jonas/externals/jonasAdmin/wsabi4j2ee-jonas-1.0.jar similarity index 100% rename from jonas/jonas/externals/jonasAdmin/wsabi4j2ee-jonas-1.0.jar rename to jonas/externals/jonasAdmin/wsabi4j2ee-jonas-1.0.jar diff --git a/jonas/jonas/externals/scout-ra/juddi.jar b/jonas/externals/scout-ra/juddi.jar similarity index 100% rename from jonas/jonas/externals/scout-ra/juddi.jar rename to jonas/externals/scout-ra/juddi.jar diff --git a/jonas/jonas/externals/scout-ra/scout.jar b/jonas/externals/scout-ra/scout.jar similarity index 100% rename from jonas/jonas/externals/scout-ra/scout.jar rename to jonas/externals/scout-ra/scout.jar diff --git a/jonas/jonas/externals/tmf/activation.jar b/jonas/externals/tmf/activation.jar similarity index 100% rename from jonas/jonas/externals/tmf/activation.jar rename to jonas/externals/tmf/activation.jar diff --git a/jonas/jonas/externals/tmf/asm-2.1.jar b/jonas/externals/tmf/asm-2.1.jar similarity index 100% rename from jonas/jonas/externals/tmf/asm-2.1.jar rename to jonas/externals/tmf/asm-2.1.jar diff --git a/jonas/jonas/externals/tmf/mail.jar b/jonas/externals/tmf/mail.jar similarity index 100% rename from jonas/jonas/externals/tmf/mail.jar rename to jonas/externals/tmf/mail.jar diff --git a/jonas/jonas/externals/tmf/mailapi.jar b/jonas/externals/tmf/mailapi.jar similarity index 100% rename from jonas/jonas/externals/tmf/mailapi.jar rename to jonas/externals/tmf/mailapi.jar diff --git a/jonas/jonas/externals/tmf/ow_area.jar b/jonas/externals/tmf/ow_area.jar similarity index 100% rename from jonas/jonas/externals/tmf/ow_area.jar rename to jonas/externals/tmf/ow_area.jar diff --git a/jonas/jonas/externals/tmf/ow_jonas_thread.jar b/jonas/externals/tmf/ow_jonas_thread.jar similarity index 100% rename from jonas/jonas/externals/tmf/ow_jonas_thread.jar rename to jonas/externals/tmf/ow_jonas_thread.jar diff --git a/jonas/jonas/externals/tmf/ow_thread.jar b/jonas/externals/tmf/ow_thread.jar similarity index 100% rename from jonas/jonas/externals/tmf/ow_thread.jar rename to jonas/externals/tmf/ow_thread.jar diff --git a/jonas/jonas/externals/tools/README b/jonas/externals/tools/README similarity index 100% rename from jonas/jonas/externals/tools/README rename to jonas/externals/tools/README diff --git a/jonas/jonas/externals/tools/axis-ant.jar b/jonas/externals/tools/axis-ant.jar similarity index 100% rename from jonas/jonas/externals/tools/axis-ant.jar rename to jonas/externals/tools/axis-ant.jar diff --git a/jonas/jonas/externals/tools/commons-digester.jar b/jonas/externals/tools/commons-digester.jar similarity index 100% rename from jonas/jonas/externals/tools/commons-digester.jar rename to jonas/externals/tools/commons-digester.jar diff --git a/jonas/jonas/externals/tools/ews-mapper-1.1.jar b/jonas/externals/tools/ews-mapper-1.1.jar similarity index 100% rename from jonas/jonas/externals/tools/ews-mapper-1.1.jar rename to jonas/externals/tools/ews-mapper-1.1.jar diff --git a/jonas/jonas/externals/tools/ow_fastrmic.jar b/jonas/externals/tools/ow_fastrmic.jar similarity index 100% rename from jonas/jonas/externals/tools/ow_fastrmic.jar rename to jonas/externals/tools/ow_fastrmic.jar diff --git a/jonas/jonas/externals/tools/ow_jorm_compiler.jar b/jonas/externals/tools/ow_jorm_compiler.jar similarity index 100% rename from jonas/jonas/externals/tools/ow_jorm_compiler.jar rename to jonas/externals/tools/ow_jorm_compiler.jar diff --git a/jonas/jonas/externals/tools/ow_util_log_wrp_velo.jar b/jonas/externals/tools/ow_util_log_wrp_velo.jar similarity index 100% rename from jonas/jonas/externals/tools/ow_util_log_wrp_velo.jar rename to jonas/externals/tools/ow_util_log_wrp_velo.jar diff --git a/jonas/jonas/externals/tools/velocity-dep-1.4.jar b/jonas/externals/tools/velocity-dep-1.4.jar similarity index 100% rename from jonas/jonas/externals/tools/velocity-dep-1.4.jar rename to jonas/externals/tools/velocity-dep-1.4.jar diff --git a/jonas/jonas/externals/tools/xbean-1.0.4.jar b/jonas/externals/tools/xbean-1.0.4.jar similarity index 100% rename from jonas/jonas/externals/tools/xbean-1.0.4.jar rename to jonas/externals/tools/xbean-1.0.4.jar diff --git a/jonas/jonas/lib/apps/README b/jonas/lib/apps/README similarity index 100% rename from jonas/jonas/lib/apps/README rename to jonas/lib/apps/README diff --git a/jonas/jonas/lib/catalina/common/lib/README b/jonas/lib/catalina/common/lib/README similarity index 100% rename from jonas/jonas/lib/catalina/common/lib/README rename to jonas/lib/catalina/common/lib/README diff --git a/jonas/jonas/lib/catalina/server/lib/README b/jonas/lib/catalina/server/lib/README similarity index 100% rename from jonas/jonas/lib/catalina/server/lib/README rename to jonas/lib/catalina/server/lib/README diff --git a/jonas/jonas/lib/catalina/shared/lib/README b/jonas/lib/catalina/shared/lib/README similarity index 100% rename from jonas/jonas/lib/catalina/shared/lib/README rename to jonas/lib/catalina/shared/lib/README diff --git a/jonas/jonas/lib/ext/README b/jonas/lib/ext/README similarity index 100% rename from jonas/jonas/lib/ext/README rename to jonas/lib/ext/README diff --git a/jonas/jonas/lib/jetty/ext/README b/jonas/lib/jetty/ext/README similarity index 100% rename from jonas/jonas/lib/jetty/ext/README rename to jonas/lib/jetty/ext/README diff --git a/jonas/jonas/lib/jetty/lib/README b/jonas/lib/jetty/lib/README similarity index 100% rename from jonas/jonas/lib/jetty/lib/README rename to jonas/lib/jetty/lib/README diff --git a/jonas/jonas/logs/README b/jonas/logs/README similarity index 100% rename from jonas/jonas/logs/README rename to jonas/logs/README diff --git a/jonas/jonas/nsis/antpage.ini b/jonas/nsis/antpage.ini similarity index 100% rename from jonas/jonas/nsis/antpage.ini rename to jonas/nsis/antpage.ini diff --git a/jonas/jonas/nsis/build.properties b/jonas/nsis/build.properties similarity index 100% rename from jonas/jonas/nsis/build.properties rename to jonas/nsis/build.properties diff --git a/jonas/jonas/nsis/build.xml b/jonas/nsis/build.xml similarity index 100% rename from jonas/jonas/nsis/build.xml rename to jonas/nsis/build.xml diff --git a/jonas/jonas/nsis/demoserver.nsi.include b/jonas/nsis/demoserver.nsi.include similarity index 100% rename from jonas/jonas/nsis/demoserver.nsi.include rename to jonas/nsis/demoserver.nsi.include diff --git a/jonas/jonas/nsis/javapage.ini b/jonas/nsis/javapage.ini similarity index 100% rename from jonas/jonas/nsis/javapage.ini rename to jonas/nsis/javapage.ini diff --git a/jonas/jonas/nsis/jonas-ant.nsi b/jonas/nsis/jonas-ant.nsi similarity index 100% rename from jonas/jonas/nsis/jonas-ant.nsi rename to jonas/nsis/jonas-ant.nsi diff --git a/jonas/jonas/nsis/jonas.ico b/jonas/nsis/jonas.ico similarity index 100% rename from jonas/jonas/nsis/jonas.ico rename to jonas/nsis/jonas.ico diff --git a/jonas/jonas/nsis/modern-header-jonas.bmp b/jonas/nsis/modern-header-jonas.bmp similarity index 100% rename from jonas/jonas/nsis/modern-header-jonas.bmp rename to jonas/nsis/modern-header-jonas.bmp diff --git a/jonas/jonas/rars/README b/jonas/rars/README similarity index 100% rename from jonas/jonas/rars/README rename to jonas/rars/README diff --git a/jonas/jonas/rars/autoload/README b/jonas/rars/autoload/README similarity index 100% rename from jonas/jonas/rars/autoload/README rename to jonas/rars/autoload/README diff --git a/jonas/jonas/rpms/jpackage/SOURCES/JONAS.README.RPM b/jonas/rpms/jpackage/SOURCES/JONAS.README.RPM similarity index 100% rename from jonas/jonas/rpms/jpackage/SOURCES/JONAS.README.RPM rename to jonas/rpms/jpackage/SOURCES/JONAS.README.RPM diff --git a/jonas/jonas/rpms/jpackage/SOURCES/jonas-4.7-buildscripts.patch b/jonas/rpms/jpackage/SOURCES/jonas-4.7-buildscripts.patch similarity index 100% rename from jonas/jonas/rpms/jpackage/SOURCES/jonas-4.7-buildscripts.patch rename to jonas/rpms/jpackage/SOURCES/jonas-4.7-buildscripts.patch diff --git a/jonas/jonas/rpms/jpackage/SOURCES/jonas-4.7-eclipse.patch b/jonas/rpms/jpackage/SOURCES/jonas-4.7-eclipse.patch similarity index 100% rename from jonas/jonas/rpms/jpackage/SOURCES/jonas-4.7-eclipse.patch rename to jonas/rpms/jpackage/SOURCES/jonas-4.7-eclipse.patch diff --git a/jonas/jonas/rpms/jpackage/SOURCES/jonas-4.7-properties.patch b/jonas/rpms/jpackage/SOURCES/jonas-4.7-properties.patch similarity index 100% rename from jonas/jonas/rpms/jpackage/SOURCES/jonas-4.7-properties.patch rename to jonas/rpms/jpackage/SOURCES/jonas-4.7-properties.patch diff --git a/jonas/jonas/rpms/jpackage/SOURCES/jonas-profile.csh b/jonas/rpms/jpackage/SOURCES/jonas-profile.csh similarity index 100% rename from jonas/jonas/rpms/jpackage/SOURCES/jonas-profile.csh rename to jonas/rpms/jpackage/SOURCES/jonas-profile.csh diff --git a/jonas/jonas/rpms/jpackage/SOURCES/jonas-profile.sh b/jonas/rpms/jpackage/SOURCES/jonas-profile.sh similarity index 100% rename from jonas/jonas/rpms/jpackage/SOURCES/jonas-profile.sh rename to jonas/rpms/jpackage/SOURCES/jonas-profile.sh diff --git a/jonas/jonas/rpms/jpackage/SOURCES/jonas.init b/jonas/rpms/jpackage/SOURCES/jonas.init similarity index 100% rename from jonas/jonas/rpms/jpackage/SOURCES/jonas.init rename to jonas/rpms/jpackage/SOURCES/jonas.init diff --git a/jonas/jonas/rpms/jpackage/SOURCES/jonas.logrotate b/jonas/rpms/jpackage/SOURCES/jonas.logrotate similarity index 100% rename from jonas/jonas/rpms/jpackage/SOURCES/jonas.logrotate rename to jonas/rpms/jpackage/SOURCES/jonas.logrotate diff --git a/jonas/jonas/rpms/jpackage/SOURCES/jonas.sysconfig b/jonas/rpms/jpackage/SOURCES/jonas.sysconfig similarity index 100% rename from jonas/jonas/rpms/jpackage/SOURCES/jonas.sysconfig rename to jonas/rpms/jpackage/SOURCES/jonas.sysconfig diff --git a/jonas/jonas/rpms/jpackage/SOURCES/mod_jk-server.xml b/jonas/rpms/jpackage/SOURCES/mod_jk-server.xml similarity index 100% rename from jonas/jonas/rpms/jpackage/SOURCES/mod_jk-server.xml rename to jonas/rpms/jpackage/SOURCES/mod_jk-server.xml diff --git a/jonas/jonas/rpms/jpackage/SPECS/jonas.spec b/jonas/rpms/jpackage/SPECS/jonas.spec similarity index 100% rename from jonas/jonas/rpms/jpackage/SPECS/jonas.spec rename to jonas/rpms/jpackage/SPECS/jonas.spec diff --git a/jonas/jonas/rpms/production/SOURCES/functions.sh b/jonas/rpms/production/SOURCES/functions.sh similarity index 100% rename from jonas/jonas/rpms/production/SOURCES/functions.sh rename to jonas/rpms/production/SOURCES/functions.sh diff --git a/jonas/jonas/rpms/production/SOURCES/jonas.init.d b/jonas/rpms/production/SOURCES/jonas.init.d similarity index 100% rename from jonas/jonas/rpms/production/SOURCES/jonas.init.d rename to jonas/rpms/production/SOURCES/jonas.init.d diff --git a/jonas/jonas/rpms/production/SPECS/jonas-objectweb.spec b/jonas/rpms/production/SPECS/jonas-objectweb.spec similarity index 100% rename from jonas/jonas/rpms/production/SPECS/jonas-objectweb.spec rename to jonas/rpms/production/SPECS/jonas-objectweb.spec diff --git a/jonas/jonas/src/.classpath b/jonas/src/.classpath similarity index 100% rename from jonas/jonas/src/.classpath rename to jonas/src/.classpath diff --git a/jonas/jonas/src/.project b/jonas/src/.project similarity index 100% rename from jonas/jonas/src/.project rename to jonas/src/.project diff --git a/jonas/jonas/src/bin/config_env.bat b/jonas/src/bin/config_env.bat similarity index 100% rename from jonas/jonas/src/bin/config_env.bat rename to jonas/src/bin/config_env.bat diff --git a/jonas/jonas/src/bin/config_env.sh b/jonas/src/bin/config_env.sh similarity index 100% rename from jonas/jonas/src/bin/config_env.sh rename to jonas/src/bin/config_env.sh diff --git a/jonas/jonas/src/bin/controlTMF.bat b/jonas/src/bin/controlTMF.bat similarity index 100% rename from jonas/jonas/src/bin/controlTMF.bat rename to jonas/src/bin/controlTMF.bat diff --git a/jonas/jonas/src/bin/controlTMF.sh b/jonas/src/bin/controlTMF.sh similarity index 100% rename from jonas/jonas/src/bin/controlTMF.sh rename to jonas/src/bin/controlTMF.sh diff --git a/jonas/jonas/src/bin/createjb.sh b/jonas/src/bin/createjb.sh similarity index 100% rename from jonas/jonas/src/bin/createjb.sh rename to jonas/src/bin/createjb.sh diff --git a/jonas/jonas/src/bin/fdf.bat b/jonas/src/bin/fdf.bat similarity index 100% rename from jonas/jonas/src/bin/fdf.bat rename to jonas/src/bin/fdf.bat diff --git a/jonas/jonas/src/bin/fdf.sh b/jonas/src/bin/fdf.sh similarity index 100% rename from jonas/jonas/src/bin/fdf.sh rename to jonas/src/bin/fdf.sh diff --git a/jonas/jonas/src/bin/jboss2jonas.sh b/jonas/src/bin/jboss2jonas.sh similarity index 100% rename from jonas/jonas/src/bin/jboss2jonas.sh rename to jonas/src/bin/jboss2jonas.sh diff --git a/jonas/jonas/src/bin/jclient.bat b/jonas/src/bin/jclient.bat similarity index 100% rename from jonas/jonas/src/bin/jclient.bat rename to jonas/src/bin/jclient.bat diff --git a/jonas/jonas/src/bin/jclient.sh b/jonas/src/bin/jclient.sh similarity index 100% rename from jonas/jonas/src/bin/jclient.sh rename to jonas/src/bin/jclient.sh diff --git a/jonas/jonas/src/bin/jclusterd.bat b/jonas/src/bin/jclusterd.bat similarity index 100% rename from jonas/jonas/src/bin/jclusterd.bat rename to jonas/src/bin/jclusterd.bat diff --git a/jonas/jonas/src/bin/jclusterd.sh b/jonas/src/bin/jclusterd.sh similarity index 100% rename from jonas/jonas/src/bin/jclusterd.sh rename to jonas/src/bin/jclusterd.sh diff --git a/jonas/jonas/src/bin/jonas.bat b/jonas/src/bin/jonas.bat similarity index 100% rename from jonas/jonas/src/bin/jonas.bat rename to jonas/src/bin/jonas.bat diff --git a/jonas/jonas/src/bin/jonas.sh b/jonas/src/bin/jonas.sh similarity index 100% rename from jonas/jonas/src/bin/jonas.sh rename to jonas/src/bin/jonas.sh diff --git a/jonas/jonas/src/bin/jonasctl.sh b/jonas/src/bin/jonasctl.sh similarity index 100% rename from jonas/jonas/src/bin/jonasctl.sh rename to jonas/src/bin/jonasctl.sh diff --git a/jonas/jonas/src/bin/jonasnt.bat b/jonas/src/bin/jonasnt.bat similarity index 100% rename from jonas/jonas/src/bin/jonasnt.bat rename to jonas/src/bin/jonasnt.bat diff --git a/jonas/jonas/src/bin/joram_raconfig.bat b/jonas/src/bin/joram_raconfig.bat similarity index 100% rename from jonas/jonas/src/bin/joram_raconfig.bat rename to jonas/src/bin/joram_raconfig.bat diff --git a/jonas/jonas/src/bin/joram_raconfig.sh b/jonas/src/bin/joram_raconfig.sh similarity index 100% rename from jonas/jonas/src/bin/joram_raconfig.sh rename to jonas/src/bin/joram_raconfig.sh diff --git a/jonas/jonas/src/bin/newjb.bat b/jonas/src/bin/newjb.bat similarity index 100% rename from jonas/jonas/src/bin/newjb.bat rename to jonas/src/bin/newjb.bat diff --git a/jonas/jonas/src/bin/newjb.sh b/jonas/src/bin/newjb.sh similarity index 100% rename from jonas/jonas/src/bin/newjb.sh rename to jonas/src/bin/newjb.sh diff --git a/jonas/jonas/src/bin/probeJgroups.bat b/jonas/src/bin/probeJgroups.bat similarity index 100% rename from jonas/jonas/src/bin/probeJgroups.bat rename to jonas/src/bin/probeJgroups.bat diff --git a/jonas/jonas/src/bin/probeJgroups.sh b/jonas/src/bin/probeJgroups.sh similarity index 100% rename from jonas/jonas/src/bin/probeJgroups.sh rename to jonas/src/bin/probeJgroups.sh diff --git a/jonas/jonas/src/bin/registry.bat b/jonas/src/bin/registry.bat similarity index 100% rename from jonas/jonas/src/bin/registry.bat rename to jonas/src/bin/registry.bat diff --git a/jonas/jonas/src/bin/registry.sh b/jonas/src/bin/registry.sh similarity index 100% rename from jonas/jonas/src/bin/registry.sh rename to jonas/src/bin/registry.sh diff --git a/jonas/jonas/src/bin/setenv.bat b/jonas/src/bin/setenv.bat similarity index 100% rename from jonas/jonas/src/bin/setenv.bat rename to jonas/src/bin/setenv.bat diff --git a/jonas/jonas/src/bin/setenv.sh.template b/jonas/src/bin/setenv.sh.template similarity index 100% rename from jonas/jonas/src/bin/setenv.sh.template rename to jonas/src/bin/setenv.sh.template diff --git a/jonas/jonas/src/conf/FirebirdSQL.properties b/jonas/src/conf/FirebirdSQL.properties similarity index 100% rename from jonas/jonas/src/conf/FirebirdSQL.properties rename to jonas/src/conf/FirebirdSQL.properties diff --git a/jonas/jonas/src/conf/HSQL1.properties b/jonas/src/conf/HSQL1.properties similarity index 100% rename from jonas/jonas/src/conf/HSQL1.properties rename to jonas/src/conf/HSQL1.properties diff --git a/jonas/jonas/src/conf/InstantDB1.properties b/jonas/src/conf/InstantDB1.properties similarity index 100% rename from jonas/jonas/src/conf/InstantDB1.properties rename to jonas/src/conf/InstantDB1.properties diff --git a/jonas/jonas/src/conf/InterBase1.properties b/jonas/src/conf/InterBase1.properties similarity index 100% rename from jonas/jonas/src/conf/InterBase1.properties rename to jonas/src/conf/InterBase1.properties diff --git a/jonas/jonas/src/conf/MailMimePartDS1.properties b/jonas/src/conf/MailMimePartDS1.properties similarity index 100% rename from jonas/jonas/src/conf/MailMimePartDS1.properties rename to jonas/src/conf/MailMimePartDS1.properties diff --git a/jonas/jonas/src/conf/MailSession1.properties b/jonas/src/conf/MailSession1.properties similarity index 100% rename from jonas/jonas/src/conf/MailSession1.properties rename to jonas/src/conf/MailSession1.properties diff --git a/jonas/jonas/src/conf/McKoi1.properties b/jonas/src/conf/McKoi1.properties similarity index 100% rename from jonas/jonas/src/conf/McKoi1.properties rename to jonas/src/conf/McKoi1.properties diff --git a/jonas/jonas/src/conf/MySQL.properties b/jonas/src/conf/MySQL.properties similarity index 100% rename from jonas/jonas/src/conf/MySQL.properties rename to jonas/src/conf/MySQL.properties diff --git a/jonas/jonas/src/conf/Oracle1.properties b/jonas/src/conf/Oracle1.properties similarity index 100% rename from jonas/jonas/src/conf/Oracle1.properties rename to jonas/src/conf/Oracle1.properties diff --git a/jonas/jonas/src/conf/PostgreSQL1.properties b/jonas/src/conf/PostgreSQL1.properties similarity index 100% rename from jonas/jonas/src/conf/PostgreSQL1.properties rename to jonas/src/conf/PostgreSQL1.properties diff --git a/jonas/jonas/src/conf/Sybase1.properties b/jonas/src/conf/Sybase1.properties similarity index 100% rename from jonas/jonas/src/conf/Sybase1.properties rename to jonas/src/conf/Sybase1.properties diff --git a/jonas/jonas/src/conf/a3debug.cfg b/jonas/src/conf/a3debug.cfg similarity index 100% rename from jonas/jonas/src/conf/a3debug.cfg rename to jonas/src/conf/a3debug.cfg diff --git a/jonas/jonas/src/conf/a3servers.xml b/jonas/src/conf/a3servers.xml similarity index 100% rename from jonas/jonas/src/conf/a3servers.xml rename to jonas/src/conf/a3servers.xml diff --git a/jonas/jonas/src/conf/carol.properties b/jonas/src/conf/carol.properties similarity index 100% rename from jonas/jonas/src/conf/carol.properties rename to jonas/src/conf/carol.properties diff --git a/jonas/jonas/src/conf/clusterd.xml b/jonas/src/conf/clusterd.xml similarity index 100% rename from jonas/jonas/src/conf/clusterd.xml rename to jonas/src/conf/clusterd.xml diff --git a/jonas/jonas/src/conf/context.xml b/jonas/src/conf/context.xml similarity index 100% rename from jonas/jonas/src/conf/context.xml rename to jonas/src/conf/context.xml diff --git a/jonas/jonas/src/conf/db2.properties b/jonas/src/conf/db2.properties similarity index 100% rename from jonas/jonas/src/conf/db2.properties rename to jonas/src/conf/db2.properties diff --git a/jonas/jonas/src/conf/domain.xml b/jonas/src/conf/domain.xml similarity index 100% rename from jonas/jonas/src/conf/domain.xml rename to jonas/src/conf/domain.xml diff --git a/jonas/jonas/src/conf/env.sh.include b/jonas/src/conf/env.sh.include similarity index 100% rename from jonas/jonas/src/conf/env.sh.include rename to jonas/src/conf/env.sh.include diff --git a/jonas/jonas/src/conf/env.start.sh.include b/jonas/src/conf/env.start.sh.include similarity index 100% rename from jonas/jonas/src/conf/env.start.sh.include rename to jonas/src/conf/env.start.sh.include diff --git a/jonas/jonas/src/conf/execute.properties b/jonas/src/conf/execute.properties similarity index 100% rename from jonas/jonas/src/conf/execute.properties rename to jonas/src/conf/execute.properties diff --git a/jonas/jonas/src/conf/file1.properties b/jonas/src/conf/file1.properties similarity index 100% rename from jonas/jonas/src/conf/file1.properties rename to jonas/src/conf/file1.properties diff --git a/jonas/jonas/src/conf/jaas.config b/jonas/src/conf/jaas.config similarity index 100% rename from jonas/jonas/src/conf/jaas.config rename to jonas/src/conf/jaas.config diff --git a/jonas/jonas/src/conf/jacorb.properties b/jonas/src/conf/jacorb.properties similarity index 100% rename from jonas/jonas/src/conf/jacorb.properties rename to jonas/src/conf/jacorb.properties diff --git a/jonas/jonas/src/conf/java.policy b/jonas/src/conf/java.policy similarity index 100% rename from jonas/jonas/src/conf/java.policy rename to jonas/src/conf/java.policy diff --git a/jonas/jonas/src/conf/jaxr.properties b/jonas/src/conf/jaxr.properties similarity index 100% rename from jonas/jonas/src/conf/jaxr.properties rename to jonas/src/conf/jaxr.properties diff --git a/jonas/jonas/src/conf/jetty5-webdefault.xml b/jonas/src/conf/jetty5-webdefault.xml similarity index 100% rename from jonas/jonas/src/conf/jetty5-webdefault.xml rename to jonas/src/conf/jetty5-webdefault.xml diff --git a/jonas/jonas/src/conf/jetty5.xml b/jonas/src/conf/jetty5.xml similarity index 100% rename from jonas/jonas/src/conf/jetty5.xml rename to jonas/src/conf/jetty5.xml diff --git a/jonas/jonas/src/conf/jgroups-cmi.xml b/jonas/src/conf/jgroups-cmi.xml similarity index 100% rename from jonas/jonas/src/conf/jgroups-cmi.xml rename to jonas/src/conf/jgroups-cmi.xml diff --git a/jonas/jonas/src/conf/jgroups-ha.xml b/jonas/src/conf/jgroups-ha.xml similarity index 100% rename from jonas/jonas/src/conf/jgroups-ha.xml rename to jonas/src/conf/jgroups-ha.xml diff --git a/jonas/jonas/src/conf/jk2.properties b/jonas/src/conf/jk2.properties similarity index 100% rename from jonas/jonas/src/conf/jk2.properties rename to jonas/src/conf/jk2.properties diff --git a/jonas/jonas/src/conf/jonas-client.properties b/jonas/src/conf/jonas-client.properties similarity index 100% rename from jonas/jonas/src/conf/jonas-client.properties rename to jonas/src/conf/jonas-client.properties diff --git a/jonas/jonas/src/conf/jonas-realm.xml b/jonas/src/conf/jonas-realm.xml similarity index 100% rename from jonas/jonas/src/conf/jonas-realm.xml rename to jonas/src/conf/jonas-realm.xml diff --git a/jonas/jonas/src/conf/jonas.properties b/jonas/src/conf/jonas.properties similarity index 100% rename from jonas/jonas/src/conf/jonas.properties rename to jonas/src/conf/jonas.properties diff --git a/jonas/jonas/src/conf/jonas_areas.xml b/jonas/src/conf/jonas_areas.xml similarity index 100% rename from jonas/jonas/src/conf/jonas_areas.xml rename to jonas/src/conf/jonas_areas.xml diff --git a/jonas/jonas/src/conf/jonathan.xml b/jonas/src/conf/jonathan.xml similarity index 100% rename from jonas/jonas/src/conf/jonathan.xml rename to jonas/src/conf/jonathan.xml diff --git a/jonas/jonas/src/conf/joramAdmin.xml b/jonas/src/conf/joramAdmin.xml similarity index 100% rename from jonas/jonas/src/conf/joramAdmin.xml rename to jonas/src/conf/joramAdmin.xml diff --git a/jonas/jonas/src/conf/jotm.properties b/jonas/src/conf/jotm.properties similarity index 100% rename from jonas/jonas/src/conf/jotm.properties rename to jonas/src/conf/jotm.properties diff --git a/jonas/jonas/src/conf/server.xml b/jonas/src/conf/server.xml similarity index 100% rename from jonas/jonas/src/conf/server.xml rename to jonas/src/conf/server.xml diff --git a/jonas/jonas/src/conf/spy.properties b/jonas/src/conf/spy.properties similarity index 100% rename from jonas/jonas/src/conf/spy.properties rename to jonas/src/conf/spy.properties diff --git a/jonas/jonas/src/conf/trace.properties b/jonas/src/conf/trace.properties similarity index 100% rename from jonas/jonas/src/conf/trace.properties rename to jonas/src/conf/trace.properties diff --git a/jonas/jonas/src/conf/traceclient.properties b/jonas/src/conf/traceclient.properties similarity index 100% rename from jonas/jonas/src/conf/traceclient.properties rename to jonas/src/conf/traceclient.properties diff --git a/jonas/jonas/src/conf/uddi.properties b/jonas/src/conf/uddi.properties similarity index 100% rename from jonas/jonas/src/conf/uddi.properties rename to jonas/src/conf/uddi.properties diff --git a/jonas/jonas/src/conf/web.xml b/jonas/src/conf/web.xml similarity index 100% rename from jonas/jonas/src/conf/web.xml rename to jonas/src/conf/web.xml diff --git a/jonas/jonas/src/conf/wrapper.conf b/jonas/src/conf/wrapper.conf similarity index 100% rename from jonas/jonas/src/conf/wrapper.conf rename to jonas/src/conf/wrapper.conf diff --git a/jonas/jonas/src/org/objectweb/common/Cmd.java b/jonas/src/org/objectweb/common/Cmd.java similarity index 100% rename from jonas/jonas/src/org/objectweb/common/Cmd.java rename to jonas/src/org/objectweb/common/Cmd.java diff --git a/jonas/jonas/src/org/objectweb/common/Env.java b/jonas/src/org/objectweb/common/Env.java similarity index 100% rename from jonas/jonas/src/org/objectweb/common/Env.java rename to jonas/src/org/objectweb/common/Env.java diff --git a/jonas/jonas/src/org/objectweb/common/README b/jonas/src/org/objectweb/common/README similarity index 100% rename from jonas/jonas/src/org/objectweb/common/README rename to jonas/src/org/objectweb/common/README diff --git a/jonas/jonas/src/org/objectweb/common/TraceCore.java b/jonas/src/org/objectweb/common/TraceCore.java similarity index 100% rename from jonas/jonas/src/org/objectweb/common/TraceCore.java rename to jonas/src/org/objectweb/common/TraceCore.java diff --git a/jonas/jonas/src/org/objectweb/common/WinSysEnv.java b/jonas/src/org/objectweb/common/WinSysEnv.java similarity index 100% rename from jonas/jonas/src/org/objectweb/common/WinSysEnv.java rename to jonas/src/org/objectweb/common/WinSysEnv.java diff --git a/jonas/jonas/src/org/objectweb/jonas/adm/Adm.java b/jonas/src/org/objectweb/jonas/adm/Adm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/adm/Adm.java rename to jonas/src/org/objectweb/jonas/adm/Adm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/adm/AdmInterface.java b/jonas/src/org/objectweb/jonas/adm/AdmInterface.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/adm/AdmInterface.java rename to jonas/src/org/objectweb/jonas/adm/AdmInterface.java diff --git a/jonas/jonas/src/org/objectweb/jonas/adm/JonasAdmin.java b/jonas/src/org/objectweb/jonas/adm/JonasAdmin.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/adm/JonasAdmin.java rename to jonas/src/org/objectweb/jonas/adm/JonasAdmin.java diff --git a/jonas/jonas/src/org/objectweb/jonas/adm/ModuleDesc.java b/jonas/src/org/objectweb/jonas/adm/ModuleDesc.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/adm/ModuleDesc.java rename to jonas/src/org/objectweb/jonas/adm/ModuleDesc.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ant/BootstrapTask.java b/jonas/src/org/objectweb/jonas/ant/BootstrapTask.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ant/BootstrapTask.java rename to jonas/src/org/objectweb/jonas/ant/BootstrapTask.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ant/DescriptorHandler.java b/jonas/src/org/objectweb/jonas/ant/DescriptorHandler.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ant/DescriptorHandler.java rename to jonas/src/org/objectweb/jonas/ant/DescriptorHandler.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ant/EJBDeploymentTool.java b/jonas/src/org/objectweb/jonas/ant/EJBDeploymentTool.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ant/EJBDeploymentTool.java rename to jonas/src/org/objectweb/jonas/ant/EJBDeploymentTool.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ant/EjbJar.java b/jonas/src/org/objectweb/jonas/ant/EjbJar.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ant/EjbJar.java rename to jonas/src/org/objectweb/jonas/ant/EjbJar.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ant/GenICTask.java b/jonas/src/org/objectweb/jonas/ant/GenICTask.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ant/GenICTask.java rename to jonas/src/org/objectweb/jonas/ant/GenICTask.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ant/GenericDeploymentTool.java b/jonas/src/org/objectweb/jonas/ant/GenericDeploymentTool.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ant/GenericDeploymentTool.java rename to jonas/src/org/objectweb/jonas/ant/GenericDeploymentTool.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ant/HotDeploymentTool.java b/jonas/src/org/objectweb/jonas/ant/HotDeploymentTool.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ant/HotDeploymentTool.java rename to jonas/src/org/objectweb/jonas/ant/HotDeploymentTool.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ant/InnerClassFilenameFilter.java b/jonas/src/org/objectweb/jonas/ant/InnerClassFilenameFilter.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ant/InnerClassFilenameFilter.java rename to jonas/src/org/objectweb/jonas/ant/InnerClassFilenameFilter.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ant/JOnASAntTool.java b/jonas/src/org/objectweb/jonas/ant/JOnASAntTool.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ant/JOnASAntTool.java rename to jonas/src/org/objectweb/jonas/ant/JOnASAntTool.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ant/JOnASBaseTask.java b/jonas/src/org/objectweb/jonas/ant/JOnASBaseTask.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ant/JOnASBaseTask.java rename to jonas/src/org/objectweb/jonas/ant/JOnASBaseTask.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ant/JOnASClusterConfigTask.java b/jonas/src/org/objectweb/jonas/ant/JOnASClusterConfigTask.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ant/JOnASClusterConfigTask.java rename to jonas/src/org/objectweb/jonas/ant/JOnASClusterConfigTask.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ant/JOnASTask.java b/jonas/src/org/objectweb/jonas/ant/JOnASTask.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ant/JOnASTask.java rename to jonas/src/org/objectweb/jonas/ant/JOnASTask.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ant/JProperty.java b/jonas/src/org/objectweb/jonas/ant/JProperty.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ant/JProperty.java rename to jonas/src/org/objectweb/jonas/ant/JProperty.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ant/JonasDeploymentTool.java b/jonas/src/org/objectweb/jonas/ant/JonasDeploymentTool.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ant/JonasDeploymentTool.java rename to jonas/src/org/objectweb/jonas/ant/JonasDeploymentTool.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ant/JonasHotDeploymentTool.java b/jonas/src/org/objectweb/jonas/ant/JonasHotDeploymentTool.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ant/JonasHotDeploymentTool.java rename to jonas/src/org/objectweb/jonas/ant/JonasHotDeploymentTool.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ant/ServerDeploy.java b/jonas/src/org/objectweb/jonas/ant/ServerDeploy.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ant/ServerDeploy.java rename to jonas/src/org/objectweb/jonas/ant/ServerDeploy.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ant/WsGenTask.java b/jonas/src/org/objectweb/jonas/ant/WsGenTask.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ant/WsGenTask.java rename to jonas/src/org/objectweb/jonas/ant/WsGenTask.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ant/cluster/CarolCluster.java b/jonas/src/org/objectweb/jonas/ant/cluster/CarolCluster.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ant/cluster/CarolCluster.java rename to jonas/src/org/objectweb/jonas/ant/cluster/CarolCluster.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ant/cluster/ClusterDaemon.java b/jonas/src/org/objectweb/jonas/ant/cluster/ClusterDaemon.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ant/cluster/ClusterDaemon.java rename to jonas/src/org/objectweb/jonas/ant/cluster/ClusterDaemon.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ant/cluster/ClusterTasks.java b/jonas/src/org/objectweb/jonas/ant/cluster/ClusterTasks.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ant/cluster/ClusterTasks.java rename to jonas/src/org/objectweb/jonas/ant/cluster/ClusterTasks.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ant/cluster/Common.java b/jonas/src/org/objectweb/jonas/ant/cluster/Common.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ant/cluster/Common.java rename to jonas/src/org/objectweb/jonas/ant/cluster/Common.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ant/cluster/DbCluster.java b/jonas/src/org/objectweb/jonas/ant/cluster/DbCluster.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ant/cluster/DbCluster.java rename to jonas/src/org/objectweb/jonas/ant/cluster/DbCluster.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ant/cluster/DbmCluster.java b/jonas/src/org/objectweb/jonas/ant/cluster/DbmCluster.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ant/cluster/DbmCluster.java rename to jonas/src/org/objectweb/jonas/ant/cluster/DbmCluster.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ant/cluster/Director.java b/jonas/src/org/objectweb/jonas/ant/cluster/Director.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ant/cluster/Director.java rename to jonas/src/org/objectweb/jonas/ant/cluster/Director.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ant/cluster/DiscoveryCluster.java b/jonas/src/org/objectweb/jonas/ant/cluster/DiscoveryCluster.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ant/cluster/DiscoveryCluster.java rename to jonas/src/org/objectweb/jonas/ant/cluster/DiscoveryCluster.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ant/cluster/EjbLevel.java b/jonas/src/org/objectweb/jonas/ant/cluster/EjbLevel.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ant/cluster/EjbLevel.java rename to jonas/src/org/objectweb/jonas/ant/cluster/EjbLevel.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ant/cluster/HaCluster.java b/jonas/src/org/objectweb/jonas/ant/cluster/HaCluster.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ant/cluster/HaCluster.java rename to jonas/src/org/objectweb/jonas/ant/cluster/HaCluster.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ant/cluster/JdbcRaCluster.java b/jonas/src/org/objectweb/jonas/ant/cluster/JdbcRaCluster.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ant/cluster/JdbcRaCluster.java rename to jonas/src/org/objectweb/jonas/ant/cluster/JdbcRaCluster.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ant/cluster/JmsCluster.java b/jonas/src/org/objectweb/jonas/ant/cluster/JmsCluster.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ant/cluster/JmsCluster.java rename to jonas/src/org/objectweb/jonas/ant/cluster/JmsCluster.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ant/cluster/LibCluster.java b/jonas/src/org/objectweb/jonas/ant/cluster/LibCluster.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ant/cluster/LibCluster.java rename to jonas/src/org/objectweb/jonas/ant/cluster/LibCluster.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ant/cluster/MailCluster.java b/jonas/src/org/objectweb/jonas/ant/cluster/MailCluster.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ant/cluster/MailCluster.java rename to jonas/src/org/objectweb/jonas/ant/cluster/MailCluster.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ant/cluster/ModJk.java b/jonas/src/org/objectweb/jonas/ant/cluster/ModJk.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ant/cluster/ModJk.java rename to jonas/src/org/objectweb/jonas/ant/cluster/ModJk.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ant/cluster/Script.java b/jonas/src/org/objectweb/jonas/ant/cluster/Script.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ant/cluster/Script.java rename to jonas/src/org/objectweb/jonas/ant/cluster/Script.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ant/cluster/ServicesCluster.java b/jonas/src/org/objectweb/jonas/ant/cluster/ServicesCluster.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ant/cluster/ServicesCluster.java rename to jonas/src/org/objectweb/jonas/ant/cluster/ServicesCluster.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ant/cluster/WebContainerCluster.java b/jonas/src/org/objectweb/jonas/ant/cluster/WebContainerCluster.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ant/cluster/WebContainerCluster.java rename to jonas/src/org/objectweb/jonas/ant/cluster/WebContainerCluster.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ant/cluster/WebLevel.java b/jonas/src/org/objectweb/jonas/ant/cluster/WebLevel.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ant/cluster/WebLevel.java rename to jonas/src/org/objectweb/jonas/ant/cluster/WebLevel.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ant/cluster/WsdlPublishCluster.java b/jonas/src/org/objectweb/jonas/ant/cluster/WsdlPublishCluster.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ant/cluster/WsdlPublishCluster.java rename to jonas/src/org/objectweb/jonas/ant/cluster/WsdlPublishCluster.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ant/jonasbase/Apps.java b/jonas/src/org/objectweb/jonas/ant/jonasbase/Apps.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ant/jonasbase/Apps.java rename to jonas/src/org/objectweb/jonas/ant/jonasbase/Apps.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ant/jonasbase/Archives.java b/jonas/src/org/objectweb/jonas/ant/jonasbase/Archives.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ant/jonasbase/Archives.java rename to jonas/src/org/objectweb/jonas/ant/jonasbase/Archives.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ant/jonasbase/BaseTaskItf.java b/jonas/src/org/objectweb/jonas/ant/jonasbase/BaseTaskItf.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ant/jonasbase/BaseTaskItf.java rename to jonas/src/org/objectweb/jonas/ant/jonasbase/BaseTaskItf.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ant/jonasbase/Carol.java b/jonas/src/org/objectweb/jonas/ant/jonasbase/Carol.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ant/jonasbase/Carol.java rename to jonas/src/org/objectweb/jonas/ant/jonasbase/Carol.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ant/jonasbase/Db.java b/jonas/src/org/objectweb/jonas/ant/jonasbase/Db.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ant/jonasbase/Db.java rename to jonas/src/org/objectweb/jonas/ant/jonasbase/Db.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ant/jonasbase/Dbm.java b/jonas/src/org/objectweb/jonas/ant/jonasbase/Dbm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ant/jonasbase/Dbm.java rename to jonas/src/org/objectweb/jonas/ant/jonasbase/Dbm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ant/jonasbase/Discovery.java b/jonas/src/org/objectweb/jonas/ant/jonasbase/Discovery.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ant/jonasbase/Discovery.java rename to jonas/src/org/objectweb/jonas/ant/jonasbase/Discovery.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ant/jonasbase/Ejbjars.java b/jonas/src/org/objectweb/jonas/ant/jonasbase/Ejbjars.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ant/jonasbase/Ejbjars.java rename to jonas/src/org/objectweb/jonas/ant/jonasbase/Ejbjars.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ant/jonasbase/Ha.java b/jonas/src/org/objectweb/jonas/ant/jonasbase/Ha.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ant/jonasbase/Ha.java rename to jonas/src/org/objectweb/jonas/ant/jonasbase/Ha.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ant/jonasbase/JCopy.java b/jonas/src/org/objectweb/jonas/ant/jonasbase/JCopy.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ant/jonasbase/JCopy.java rename to jonas/src/org/objectweb/jonas/ant/jonasbase/JCopy.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ant/jonasbase/JEcho.java b/jonas/src/org/objectweb/jonas/ant/jonasbase/JEcho.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ant/jonasbase/JEcho.java rename to jonas/src/org/objectweb/jonas/ant/jonasbase/JEcho.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ant/jonasbase/JMkdir.java b/jonas/src/org/objectweb/jonas/ant/jonasbase/JMkdir.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ant/jonasbase/JMkdir.java rename to jonas/src/org/objectweb/jonas/ant/jonasbase/JMkdir.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ant/jonasbase/JReplace.java b/jonas/src/org/objectweb/jonas/ant/jonasbase/JReplace.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ant/jonasbase/JReplace.java rename to jonas/src/org/objectweb/jonas/ant/jonasbase/JReplace.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ant/jonasbase/JTask.java b/jonas/src/org/objectweb/jonas/ant/jonasbase/JTask.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ant/jonasbase/JTask.java rename to jonas/src/org/objectweb/jonas/ant/jonasbase/JTask.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ant/jonasbase/JTouch.java b/jonas/src/org/objectweb/jonas/ant/jonasbase/JTouch.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ant/jonasbase/JTouch.java rename to jonas/src/org/objectweb/jonas/ant/jonasbase/JTouch.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ant/jonasbase/JdbcRa.java b/jonas/src/org/objectweb/jonas/ant/jonasbase/JdbcRa.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ant/jonasbase/JdbcRa.java rename to jonas/src/org/objectweb/jonas/ant/jonasbase/JdbcRa.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ant/jonasbase/Jms.java b/jonas/src/org/objectweb/jonas/ant/jonasbase/Jms.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ant/jonasbase/Jms.java rename to jonas/src/org/objectweb/jonas/ant/jonasbase/Jms.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ant/jonasbase/JmsRa.java b/jonas/src/org/objectweb/jonas/ant/jonasbase/JmsRa.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ant/jonasbase/JmsRa.java rename to jonas/src/org/objectweb/jonas/ant/jonasbase/JmsRa.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ant/jonasbase/Lib.java b/jonas/src/org/objectweb/jonas/ant/jonasbase/Lib.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ant/jonasbase/Lib.java rename to jonas/src/org/objectweb/jonas/ant/jonasbase/Lib.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ant/jonasbase/Mail.java b/jonas/src/org/objectweb/jonas/ant/jonasbase/Mail.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ant/jonasbase/Mail.java rename to jonas/src/org/objectweb/jonas/ant/jonasbase/Mail.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ant/jonasbase/Rars.java b/jonas/src/org/objectweb/jonas/ant/jonasbase/Rars.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ant/jonasbase/Rars.java rename to jonas/src/org/objectweb/jonas/ant/jonasbase/Rars.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ant/jonasbase/Replace.java b/jonas/src/org/objectweb/jonas/ant/jonasbase/Replace.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ant/jonasbase/Replace.java rename to jonas/src/org/objectweb/jonas/ant/jonasbase/Replace.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ant/jonasbase/Services.java b/jonas/src/org/objectweb/jonas/ant/jonasbase/Services.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ant/jonasbase/Services.java rename to jonas/src/org/objectweb/jonas/ant/jonasbase/Services.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ant/jonasbase/Tasks.java b/jonas/src/org/objectweb/jonas/ant/jonasbase/Tasks.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ant/jonasbase/Tasks.java rename to jonas/src/org/objectweb/jonas/ant/jonasbase/Tasks.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ant/jonasbase/Wars.java b/jonas/src/org/objectweb/jonas/ant/jonasbase/Wars.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ant/jonasbase/Wars.java rename to jonas/src/org/objectweb/jonas/ant/jonasbase/Wars.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ant/jonasbase/WebContainer.java b/jonas/src/org/objectweb/jonas/ant/jonasbase/WebContainer.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ant/jonasbase/WebContainer.java rename to jonas/src/org/objectweb/jonas/ant/jonasbase/WebContainer.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ant/jonasbase/XMLSerializerTask.java b/jonas/src/org/objectweb/jonas/ant/jonasbase/XMLSerializerTask.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ant/jonasbase/XMLSerializerTask.java rename to jonas/src/org/objectweb/jonas/ant/jonasbase/XMLSerializerTask.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ant/jonasbase/web/Ajp.java b/jonas/src/org/objectweb/jonas/ant/jonasbase/web/Ajp.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ant/jonasbase/web/Ajp.java rename to jonas/src/org/objectweb/jonas/ant/jonasbase/web/Ajp.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ant/jonasbase/web/Cluster.java b/jonas/src/org/objectweb/jonas/ant/jonasbase/web/Cluster.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ant/jonasbase/web/Cluster.java rename to jonas/src/org/objectweb/jonas/ant/jonasbase/web/Cluster.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ant/jonasbase/web/Director.java b/jonas/src/org/objectweb/jonas/ant/jonasbase/web/Director.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ant/jonasbase/web/Director.java rename to jonas/src/org/objectweb/jonas/ant/jonasbase/web/Director.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ant/jonasbase/web/Http.java b/jonas/src/org/objectweb/jonas/ant/jonasbase/web/Http.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ant/jonasbase/web/Http.java rename to jonas/src/org/objectweb/jonas/ant/jonasbase/web/Http.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ant/jonasbase/web/Https.java b/jonas/src/org/objectweb/jonas/ant/jonasbase/web/Https.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ant/jonasbase/web/Https.java rename to jonas/src/org/objectweb/jonas/ant/jonasbase/web/Https.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ant/jonasbase/web/Jetty.java b/jonas/src/org/objectweb/jonas/ant/jonasbase/web/Jetty.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ant/jonasbase/web/Jetty.java rename to jonas/src/org/objectweb/jonas/ant/jonasbase/web/Jetty.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ant/jonasbase/web/Tomcat.java b/jonas/src/org/objectweb/jonas/ant/jonasbase/web/Tomcat.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ant/jonasbase/web/Tomcat.java rename to jonas/src/org/objectweb/jonas/ant/jonasbase/web/Tomcat.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ant/jonasbase/wsdl/File.java b/jonas/src/org/objectweb/jonas/ant/jonasbase/wsdl/File.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ant/jonasbase/wsdl/File.java rename to jonas/src/org/objectweb/jonas/ant/jonasbase/wsdl/File.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ant/jonasbase/wsdl/Uddi.java b/jonas/src/org/objectweb/jonas/ant/jonasbase/wsdl/Uddi.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ant/jonasbase/wsdl/Uddi.java rename to jonas/src/org/objectweb/jonas/ant/jonasbase/wsdl/Uddi.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ant/jonasbase/wsdl/WsdlPublish.java b/jonas/src/org/objectweb/jonas/ant/jonasbase/wsdl/WsdlPublish.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ant/jonasbase/wsdl/WsdlPublish.java rename to jonas/src/org/objectweb/jonas/ant/jonasbase/wsdl/WsdlPublish.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ant/readme b/jonas/src/org/objectweb/jonas/ant/readme similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ant/readme rename to jonas/src/org/objectweb/jonas/ant/readme diff --git a/jonas/jonas/src/org/objectweb/jonas/client/AppClientModule.java b/jonas/src/org/objectweb/jonas/client/AppClientModule.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/client/AppClientModule.java rename to jonas/src/org/objectweb/jonas/client/AppClientModule.java diff --git a/jonas/jonas/src/org/objectweb/jonas/client/ClientContainer.java b/jonas/src/org/objectweb/jonas/client/ClientContainer.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/client/ClientContainer.java rename to jonas/src/org/objectweb/jonas/client/ClientContainer.java diff --git a/jonas/jonas/src/org/objectweb/jonas/client/ClientContainerException.java b/jonas/src/org/objectweb/jonas/client/ClientContainerException.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/client/ClientContainerException.java rename to jonas/src/org/objectweb/jonas/client/ClientContainerException.java diff --git a/jonas/jonas/src/org/objectweb/jonas/cluster/daemon/ClusterDaemon.java b/jonas/src/org/objectweb/jonas/cluster/daemon/ClusterDaemon.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/cluster/daemon/ClusterDaemon.java rename to jonas/src/org/objectweb/jonas/cluster/daemon/ClusterDaemon.java diff --git a/jonas/jonas/src/org/objectweb/jonas/cluster/daemon/ClusterDaemonAdmin.java b/jonas/src/org/objectweb/jonas/cluster/daemon/ClusterDaemonAdmin.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/cluster/daemon/ClusterDaemonAdmin.java rename to jonas/src/org/objectweb/jonas/cluster/daemon/ClusterDaemonAdmin.java diff --git a/jonas/jonas/src/org/objectweb/jonas/cluster/daemon/ClusterDaemonException.java b/jonas/src/org/objectweb/jonas/cluster/daemon/ClusterDaemonException.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/cluster/daemon/ClusterDaemonException.java rename to jonas/src/org/objectweb/jonas/cluster/daemon/ClusterDaemonException.java diff --git a/jonas/jonas/src/org/objectweb/jonas/cluster/daemon/ClusterDaemonMBean.java b/jonas/src/org/objectweb/jonas/cluster/daemon/ClusterDaemonMBean.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/cluster/daemon/ClusterDaemonMBean.java rename to jonas/src/org/objectweb/jonas/cluster/daemon/ClusterDaemonMBean.java diff --git a/jonas/jonas/src/org/objectweb/jonas/cluster/daemon/ClusterDaemonTools.java b/jonas/src/org/objectweb/jonas/cluster/daemon/ClusterDaemonTools.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/cluster/daemon/ClusterDaemonTools.java rename to jonas/src/org/objectweb/jonas/cluster/daemon/ClusterDaemonTools.java diff --git a/jonas/jonas/src/org/objectweb/jonas/common/ContextDump.java b/jonas/src/org/objectweb/jonas/common/ContextDump.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/common/ContextDump.java rename to jonas/src/org/objectweb/jonas/common/ContextDump.java diff --git a/jonas/jonas/src/org/objectweb/jonas/common/JJarFile.java b/jonas/src/org/objectweb/jonas/common/JJarFile.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/common/JJarFile.java rename to jonas/src/org/objectweb/jonas/common/JJarFile.java diff --git a/jonas/jonas/src/org/objectweb/jonas/common/JModule.java b/jonas/src/org/objectweb/jonas/common/JModule.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/common/JModule.java rename to jonas/src/org/objectweb/jonas/common/JModule.java diff --git a/jonas/jonas/src/org/objectweb/jonas/common/JNDIUtils.java b/jonas/src/org/objectweb/jonas/common/JNDIUtils.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/common/JNDIUtils.java rename to jonas/src/org/objectweb/jonas/common/JNDIUtils.java diff --git a/jonas/jonas/src/org/objectweb/jonas/common/JProp.java b/jonas/src/org/objectweb/jonas/common/JProp.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/common/JProp.java rename to jonas/src/org/objectweb/jonas/common/JProp.java diff --git a/jonas/jonas/src/org/objectweb/jonas/common/Log.java b/jonas/src/org/objectweb/jonas/common/Log.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/common/Log.java rename to jonas/src/org/objectweb/jonas/common/Log.java diff --git a/jonas/jonas/src/org/objectweb/jonas/common/LogManagement.java b/jonas/src/org/objectweb/jonas/common/LogManagement.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/common/LogManagement.java rename to jonas/src/org/objectweb/jonas/common/LogManagement.java diff --git a/jonas/jonas/src/org/objectweb/jonas/common/LogManagementMBean.java b/jonas/src/org/objectweb/jonas/common/LogManagementMBean.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/common/LogManagementMBean.java rename to jonas/src/org/objectweb/jonas/common/LogManagementMBean.java diff --git a/jonas/jonas/src/org/objectweb/jonas/common/NetUtils.java b/jonas/src/org/objectweb/jonas/common/NetUtils.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/common/NetUtils.java rename to jonas/src/org/objectweb/jonas/common/NetUtils.java diff --git a/jonas/jonas/src/org/objectweb/jonas/common/PropDump.java b/jonas/src/org/objectweb/jonas/common/PropDump.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/common/PropDump.java rename to jonas/src/org/objectweb/jonas/common/PropDump.java diff --git a/jonas/jonas/src/org/objectweb/jonas/container/EJB.java b/jonas/src/org/objectweb/jonas/container/EJB.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/container/EJB.java rename to jonas/src/org/objectweb/jonas/container/EJB.java diff --git a/jonas/jonas/src/org/objectweb/jonas/container/EJBModule.java b/jonas/src/org/objectweb/jonas/container/EJBModule.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/container/EJBModule.java rename to jonas/src/org/objectweb/jonas/container/EJBModule.java diff --git a/jonas/jonas/src/org/objectweb/jonas/container/EJBService.java b/jonas/src/org/objectweb/jonas/container/EJBService.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/container/EJBService.java rename to jonas/src/org/objectweb/jonas/container/EJBService.java diff --git a/jonas/jonas/src/org/objectweb/jonas/container/EJBServiceImpl.java b/jonas/src/org/objectweb/jonas/container/EJBServiceImpl.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/container/EJBServiceImpl.java rename to jonas/src/org/objectweb/jonas/container/EJBServiceImpl.java diff --git a/jonas/jonas/src/org/objectweb/jonas/container/EJBServiceImplMBean.java b/jonas/src/org/objectweb/jonas/container/EJBServiceImplMBean.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/container/EJBServiceImplMBean.java rename to jonas/src/org/objectweb/jonas/container/EJBServiceImplMBean.java diff --git a/jonas/jonas/src/org/objectweb/jonas/container/EntityBean.java b/jonas/src/org/objectweb/jonas/container/EntityBean.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/container/EntityBean.java rename to jonas/src/org/objectweb/jonas/container/EntityBean.java diff --git a/jonas/jonas/src/org/objectweb/jonas/container/MessageDrivenBean.java b/jonas/src/org/objectweb/jonas/container/MessageDrivenBean.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/container/MessageDrivenBean.java rename to jonas/src/org/objectweb/jonas/container/MessageDrivenBean.java diff --git a/jonas/jonas/src/org/objectweb/jonas/container/PrincipalFactoryImpl.java b/jonas/src/org/objectweb/jonas/container/PrincipalFactoryImpl.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/container/PrincipalFactoryImpl.java rename to jonas/src/org/objectweb/jonas/container/PrincipalFactoryImpl.java diff --git a/jonas/jonas/src/org/objectweb/jonas/container/Protocols.java b/jonas/src/org/objectweb/jonas/container/Protocols.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/container/Protocols.java rename to jonas/src/org/objectweb/jonas/container/Protocols.java diff --git a/jonas/jonas/src/org/objectweb/jonas/container/SessionBean.java b/jonas/src/org/objectweb/jonas/container/SessionBean.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/container/SessionBean.java rename to jonas/src/org/objectweb/jonas/container/SessionBean.java diff --git a/jonas/jonas/src/org/objectweb/jonas/container/StatefulSessionBean.java b/jonas/src/org/objectweb/jonas/container/StatefulSessionBean.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/container/StatefulSessionBean.java rename to jonas/src/org/objectweb/jonas/container/StatefulSessionBean.java diff --git a/jonas/jonas/src/org/objectweb/jonas/container/StatelessSessionBean.java b/jonas/src/org/objectweb/jonas/container/StatelessSessionBean.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/container/StatelessSessionBean.java rename to jonas/src/org/objectweb/jonas/container/StatelessSessionBean.java diff --git a/jonas/jonas/src/org/objectweb/jonas/container/mbeans-descriptors.xml b/jonas/src/org/objectweb/jonas/container/mbeans-descriptors.xml similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/container/mbeans-descriptors.xml rename to jonas/src/org/objectweb/jonas/container/mbeans-descriptors.xml diff --git a/jonas/jonas/src/org/objectweb/jonas/db/AbsDBServiceImpl.java b/jonas/src/org/objectweb/jonas/db/AbsDBServiceImpl.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/db/AbsDBServiceImpl.java rename to jonas/src/org/objectweb/jonas/db/AbsDBServiceImpl.java diff --git a/jonas/jonas/src/org/objectweb/jonas/db/AbsDBServiceImplMBean.java b/jonas/src/org/objectweb/jonas/db/AbsDBServiceImplMBean.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/db/AbsDBServiceImplMBean.java rename to jonas/src/org/objectweb/jonas/db/AbsDBServiceImplMBean.java diff --git a/jonas/jonas/src/org/objectweb/jonas/db/DBService.java b/jonas/src/org/objectweb/jonas/db/DBService.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/db/DBService.java rename to jonas/src/org/objectweb/jonas/db/DBService.java diff --git a/jonas/jonas/src/org/objectweb/jonas/db/User.java b/jonas/src/org/objectweb/jonas/db/User.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/db/User.java rename to jonas/src/org/objectweb/jonas/db/User.java diff --git a/jonas/jonas/src/org/objectweb/jonas/db/hsqldb/HsqlDBServiceImpl.java b/jonas/src/org/objectweb/jonas/db/hsqldb/HsqlDBServiceImpl.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/db/hsqldb/HsqlDBServiceImpl.java rename to jonas/src/org/objectweb/jonas/db/hsqldb/HsqlDBServiceImpl.java diff --git a/jonas/jonas/src/org/objectweb/jonas/dbm/ConnectionManager.java b/jonas/src/org/objectweb/jonas/dbm/ConnectionManager.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/dbm/ConnectionManager.java rename to jonas/src/org/objectweb/jonas/dbm/ConnectionManager.java diff --git a/jonas/jonas/src/org/objectweb/jonas/dbm/DataBaseService.java b/jonas/src/org/objectweb/jonas/dbm/DataBaseService.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/dbm/DataBaseService.java rename to jonas/src/org/objectweb/jonas/dbm/DataBaseService.java diff --git a/jonas/jonas/src/org/objectweb/jonas/dbm/DataBaseServiceImpl.java b/jonas/src/org/objectweb/jonas/dbm/DataBaseServiceImpl.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/dbm/DataBaseServiceImpl.java rename to jonas/src/org/objectweb/jonas/dbm/DataBaseServiceImpl.java diff --git a/jonas/jonas/src/org/objectweb/jonas/dbm/DataBaseServiceImplMBean.java b/jonas/src/org/objectweb/jonas/dbm/DataBaseServiceImplMBean.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/dbm/DataBaseServiceImplMBean.java rename to jonas/src/org/objectweb/jonas/dbm/DataBaseServiceImplMBean.java diff --git a/jonas/jonas/src/org/objectweb/jonas/dbm/DataSourceFactory.java b/jonas/src/org/objectweb/jonas/dbm/DataSourceFactory.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/dbm/DataSourceFactory.java rename to jonas/src/org/objectweb/jonas/dbm/DataSourceFactory.java diff --git a/jonas/jonas/src/org/objectweb/jonas/dbm/JConnection.java b/jonas/src/org/objectweb/jonas/dbm/JConnection.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/dbm/JConnection.java rename to jonas/src/org/objectweb/jonas/dbm/JConnection.java diff --git a/jonas/jonas/src/org/objectweb/jonas/dbm/JDBCDataSource.java b/jonas/src/org/objectweb/jonas/dbm/JDBCDataSource.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/dbm/JDBCDataSource.java rename to jonas/src/org/objectweb/jonas/dbm/JDBCDataSource.java diff --git a/jonas/jonas/src/org/objectweb/jonas/dbm/JDBCDataSourceMBean.java b/jonas/src/org/objectweb/jonas/dbm/JDBCDataSourceMBean.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/dbm/JDBCDataSourceMBean.java rename to jonas/src/org/objectweb/jonas/dbm/JDBCDataSourceMBean.java diff --git a/jonas/jonas/src/org/objectweb/jonas/dbm/JDBCDriver.java b/jonas/src/org/objectweb/jonas/dbm/JDBCDriver.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/dbm/JDBCDriver.java rename to jonas/src/org/objectweb/jonas/dbm/JDBCDriver.java diff --git a/jonas/jonas/src/org/objectweb/jonas/dbm/JDBCResource.java b/jonas/src/org/objectweb/jonas/dbm/JDBCResource.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/dbm/JDBCResource.java rename to jonas/src/org/objectweb/jonas/dbm/JDBCResource.java diff --git a/jonas/jonas/src/org/objectweb/jonas/dbm/JManagedConnection.java b/jonas/src/org/objectweb/jonas/dbm/JManagedConnection.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/dbm/JManagedConnection.java rename to jonas/src/org/objectweb/jonas/dbm/JManagedConnection.java diff --git a/jonas/jonas/src/org/objectweb/jonas/dbm/JStatement.java b/jonas/src/org/objectweb/jonas/dbm/JStatement.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/dbm/JStatement.java rename to jonas/src/org/objectweb/jonas/dbm/JStatement.java diff --git a/jonas/jonas/src/org/objectweb/jonas/dbm/Pool.java b/jonas/src/org/objectweb/jonas/dbm/Pool.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/dbm/Pool.java rename to jonas/src/org/objectweb/jonas/dbm/Pool.java diff --git a/jonas/jonas/src/org/objectweb/jonas/dbm/mbeans-descriptors.xml b/jonas/src/org/objectweb/jonas/dbm/mbeans-descriptors.xml similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/dbm/mbeans-descriptors.xml rename to jonas/src/org/objectweb/jonas/dbm/mbeans-descriptors.xml diff --git a/jonas/jonas/src/org/objectweb/jonas/discovery/DiscEvent.java b/jonas/src/org/objectweb/jonas/discovery/DiscEvent.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/discovery/DiscEvent.java rename to jonas/src/org/objectweb/jonas/discovery/DiscEvent.java diff --git a/jonas/jonas/src/org/objectweb/jonas/discovery/DiscGreeting.java b/jonas/src/org/objectweb/jonas/discovery/DiscGreeting.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/discovery/DiscGreeting.java rename to jonas/src/org/objectweb/jonas/discovery/DiscGreeting.java diff --git a/jonas/jonas/src/org/objectweb/jonas/discovery/DiscMessage.java b/jonas/src/org/objectweb/jonas/discovery/DiscMessage.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/discovery/DiscMessage.java rename to jonas/src/org/objectweb/jonas/discovery/DiscMessage.java diff --git a/jonas/jonas/src/org/objectweb/jonas/discovery/DiscoveryClient.java b/jonas/src/org/objectweb/jonas/discovery/DiscoveryClient.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/discovery/DiscoveryClient.java rename to jonas/src/org/objectweb/jonas/discovery/DiscoveryClient.java diff --git a/jonas/jonas/src/org/objectweb/jonas/discovery/DiscoveryClientListener.java b/jonas/src/org/objectweb/jonas/discovery/DiscoveryClientListener.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/discovery/DiscoveryClientListener.java rename to jonas/src/org/objectweb/jonas/discovery/DiscoveryClientListener.java diff --git a/jonas/jonas/src/org/objectweb/jonas/discovery/DiscoveryClientMBean.java b/jonas/src/org/objectweb/jonas/discovery/DiscoveryClientMBean.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/discovery/DiscoveryClientMBean.java rename to jonas/src/org/objectweb/jonas/discovery/DiscoveryClientMBean.java diff --git a/jonas/jonas/src/org/objectweb/jonas/discovery/DiscoveryComm.java b/jonas/src/org/objectweb/jonas/discovery/DiscoveryComm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/discovery/DiscoveryComm.java rename to jonas/src/org/objectweb/jonas/discovery/DiscoveryComm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/discovery/DiscoveryGreetingListener.java b/jonas/src/org/objectweb/jonas/discovery/DiscoveryGreetingListener.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/discovery/DiscoveryGreetingListener.java rename to jonas/src/org/objectweb/jonas/discovery/DiscoveryGreetingListener.java diff --git a/jonas/jonas/src/org/objectweb/jonas/discovery/DiscoveryGreetingResponder.java b/jonas/src/org/objectweb/jonas/discovery/DiscoveryGreetingResponder.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/discovery/DiscoveryGreetingResponder.java rename to jonas/src/org/objectweb/jonas/discovery/DiscoveryGreetingResponder.java diff --git a/jonas/jonas/src/org/objectweb/jonas/discovery/DiscoveryHelper.java b/jonas/src/org/objectweb/jonas/discovery/DiscoveryHelper.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/discovery/DiscoveryHelper.java rename to jonas/src/org/objectweb/jonas/discovery/DiscoveryHelper.java diff --git a/jonas/jonas/src/org/objectweb/jonas/discovery/DiscoveryListener.java b/jonas/src/org/objectweb/jonas/discovery/DiscoveryListener.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/discovery/DiscoveryListener.java rename to jonas/src/org/objectweb/jonas/discovery/DiscoveryListener.java diff --git a/jonas/jonas/src/org/objectweb/jonas/discovery/DiscoveryManager.java b/jonas/src/org/objectweb/jonas/discovery/DiscoveryManager.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/discovery/DiscoveryManager.java rename to jonas/src/org/objectweb/jonas/discovery/DiscoveryManager.java diff --git a/jonas/jonas/src/org/objectweb/jonas/discovery/DiscoveryManagerMBean.java b/jonas/src/org/objectweb/jonas/discovery/DiscoveryManagerMBean.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/discovery/DiscoveryManagerMBean.java rename to jonas/src/org/objectweb/jonas/discovery/DiscoveryManagerMBean.java diff --git a/jonas/jonas/src/org/objectweb/jonas/discovery/DiscoveryService.java b/jonas/src/org/objectweb/jonas/discovery/DiscoveryService.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/discovery/DiscoveryService.java rename to jonas/src/org/objectweb/jonas/discovery/DiscoveryService.java diff --git a/jonas/jonas/src/org/objectweb/jonas/discovery/DiscoveryServiceImpl.java b/jonas/src/org/objectweb/jonas/discovery/DiscoveryServiceImpl.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/discovery/DiscoveryServiceImpl.java rename to jonas/src/org/objectweb/jonas/discovery/DiscoveryServiceImpl.java diff --git a/jonas/jonas/src/org/objectweb/jonas/discovery/DiscoveryServiceImplMBean.java b/jonas/src/org/objectweb/jonas/discovery/DiscoveryServiceImplMBean.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/discovery/DiscoveryServiceImplMBean.java rename to jonas/src/org/objectweb/jonas/discovery/DiscoveryServiceImplMBean.java diff --git a/jonas/jonas/src/org/objectweb/jonas/discovery/DiscoveryState.java b/jonas/src/org/objectweb/jonas/discovery/DiscoveryState.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/discovery/DiscoveryState.java rename to jonas/src/org/objectweb/jonas/discovery/DiscoveryState.java diff --git a/jonas/jonas/src/org/objectweb/jonas/discovery/DuplicateServerNameException.java b/jonas/src/org/objectweb/jonas/discovery/DuplicateServerNameException.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/discovery/DuplicateServerNameException.java rename to jonas/src/org/objectweb/jonas/discovery/DuplicateServerNameException.java diff --git a/jonas/jonas/src/org/objectweb/jonas/discovery/Enroller.java b/jonas/src/org/objectweb/jonas/discovery/Enroller.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/discovery/Enroller.java rename to jonas/src/org/objectweb/jonas/discovery/Enroller.java diff --git a/jonas/jonas/src/org/objectweb/jonas/discovery/EnrollerMBean.java b/jonas/src/org/objectweb/jonas/discovery/EnrollerMBean.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/discovery/EnrollerMBean.java rename to jonas/src/org/objectweb/jonas/discovery/EnrollerMBean.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ear/Ear.java b/jonas/src/org/objectweb/jonas/ear/Ear.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ear/Ear.java rename to jonas/src/org/objectweb/jonas/ear/Ear.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ear/EarMBean.java b/jonas/src/org/objectweb/jonas/ear/EarMBean.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ear/EarMBean.java rename to jonas/src/org/objectweb/jonas/ear/EarMBean.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ear/EarService.java b/jonas/src/org/objectweb/jonas/ear/EarService.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ear/EarService.java rename to jonas/src/org/objectweb/jonas/ear/EarService.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ear/EarServiceException.java b/jonas/src/org/objectweb/jonas/ear/EarServiceException.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ear/EarServiceException.java rename to jonas/src/org/objectweb/jonas/ear/EarServiceException.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ear/EarServiceImpl.java b/jonas/src/org/objectweb/jonas/ear/EarServiceImpl.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ear/EarServiceImpl.java rename to jonas/src/org/objectweb/jonas/ear/EarServiceImpl.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ear/EarServiceImplMBean.java b/jonas/src/org/objectweb/jonas/ear/EarServiceImplMBean.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ear/EarServiceImplMBean.java rename to jonas/src/org/objectweb/jonas/ear/EarServiceImplMBean.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ear/lib/EarClassPathManager.java b/jonas/src/org/objectweb/jonas/ear/lib/EarClassPathManager.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ear/lib/EarClassPathManager.java rename to jonas/src/org/objectweb/jonas/ear/lib/EarClassPathManager.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ear/lib/EarClassPathManagerException.java b/jonas/src/org/objectweb/jonas/ear/lib/EarClassPathManagerException.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ear/lib/EarClassPathManagerException.java rename to jonas/src/org/objectweb/jonas/ear/lib/EarClassPathManagerException.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ear/lib/JarList.java b/jonas/src/org/objectweb/jonas/ear/lib/JarList.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ear/lib/JarList.java rename to jonas/src/org/objectweb/jonas/ear/lib/JarList.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ear/lib/JarListException.java b/jonas/src/org/objectweb/jonas/ear/lib/JarListException.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ear/lib/JarListException.java rename to jonas/src/org/objectweb/jonas/ear/lib/JarListException.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ear/mbeans-descriptors.xml b/jonas/src/org/objectweb/jonas/ear/mbeans-descriptors.xml similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ear/mbeans-descriptors.xml rename to jonas/src/org/objectweb/jonas/ear/mbeans-descriptors.xml diff --git a/jonas/jonas/src/org/objectweb/jonas/ha/EntityBeanRefImpl.java b/jonas/src/org/objectweb/jonas/ha/EntityBeanRefImpl.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ha/EntityBeanRefImpl.java rename to jonas/src/org/objectweb/jonas/ha/EntityBeanRefImpl.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ha/HaService.java b/jonas/src/org/objectweb/jonas/ha/HaService.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ha/HaService.java rename to jonas/src/org/objectweb/jonas/ha/HaService.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ha/HaServiceImpl.java b/jonas/src/org/objectweb/jonas/ha/HaServiceImpl.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ha/HaServiceImpl.java rename to jonas/src/org/objectweb/jonas/ha/HaServiceImpl.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ha/StatefulBeanRefImpl.java b/jonas/src/org/objectweb/jonas/ha/StatefulBeanRefImpl.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ha/StatefulBeanRefImpl.java rename to jonas/src/org/objectweb/jonas/ha/StatefulBeanRefImpl.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ha/interceptor/HAClientInterceptor.java b/jonas/src/org/objectweb/jonas/ha/interceptor/HAClientInterceptor.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ha/interceptor/HAClientInterceptor.java rename to jonas/src/org/objectweb/jonas/ha/interceptor/HAClientInterceptor.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ha/interceptor/HAContext.java b/jonas/src/org/objectweb/jonas/ha/interceptor/HAContext.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ha/interceptor/HAContext.java rename to jonas/src/org/objectweb/jonas/ha/interceptor/HAContext.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ha/interceptor/HACurrentContext.java b/jonas/src/org/objectweb/jonas/ha/interceptor/HACurrentContext.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ha/interceptor/HACurrentContext.java rename to jonas/src/org/objectweb/jonas/ha/interceptor/HACurrentContext.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ha/interceptor/HACurrentDelegateImpl.java b/jonas/src/org/objectweb/jonas/ha/interceptor/HACurrentDelegateImpl.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ha/interceptor/HACurrentDelegateImpl.java rename to jonas/src/org/objectweb/jonas/ha/interceptor/HACurrentDelegateImpl.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ha/interceptor/HAInterceptorInitializer.java b/jonas/src/org/objectweb/jonas/ha/interceptor/HAInterceptorInitializer.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ha/interceptor/HAInterceptorInitializer.java rename to jonas/src/org/objectweb/jonas/ha/interceptor/HAInterceptorInitializer.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ha/interceptor/HAServerInterceptor.java b/jonas/src/org/objectweb/jonas/ha/interceptor/HAServerInterceptor.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ha/interceptor/HAServerInterceptor.java rename to jonas/src/org/objectweb/jonas/ha/interceptor/HAServerInterceptor.java diff --git a/jonas/jonas/src/org/objectweb/jonas/jaxr/JAXRConnection.java b/jonas/src/org/objectweb/jonas/jaxr/JAXRConnection.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/jaxr/JAXRConnection.java rename to jonas/src/org/objectweb/jonas/jaxr/JAXRConnection.java diff --git a/jonas/jonas/src/org/objectweb/jonas/jaxr/JAXRService.java b/jonas/src/org/objectweb/jonas/jaxr/JAXRService.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/jaxr/JAXRService.java rename to jonas/src/org/objectweb/jonas/jaxr/JAXRService.java diff --git a/jonas/jonas/src/org/objectweb/jonas/jaxr/JAXRServiceImpl.java b/jonas/src/org/objectweb/jonas/jaxr/JAXRServiceImpl.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/jaxr/JAXRServiceImpl.java rename to jonas/src/org/objectweb/jonas/jaxr/JAXRServiceImpl.java diff --git a/jonas/jonas/src/org/objectweb/jonas/jaxr/factory/JAXRFactory.java b/jonas/src/org/objectweb/jonas/jaxr/factory/JAXRFactory.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/jaxr/factory/JAXRFactory.java rename to jonas/src/org/objectweb/jonas/jaxr/factory/JAXRFactory.java diff --git a/jonas/jonas/src/org/objectweb/jonas/jaxr/scout/JAXRResourceAdapter.java b/jonas/src/org/objectweb/jonas/jaxr/scout/JAXRResourceAdapter.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/jaxr/scout/JAXRResourceAdapter.java rename to jonas/src/org/objectweb/jonas/jaxr/scout/JAXRResourceAdapter.java diff --git a/jonas/jonas/src/org/objectweb/jonas/jaxr/scout/JConnectionFactory.java b/jonas/src/org/objectweb/jonas/jaxr/scout/JConnectionFactory.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/jaxr/scout/JConnectionFactory.java rename to jonas/src/org/objectweb/jonas/jaxr/scout/JConnectionFactory.java diff --git a/jonas/jonas/src/org/objectweb/jonas/jaxr/scout/ManagedConnectionFactoryImpl.java b/jonas/src/org/objectweb/jonas/jaxr/scout/ManagedConnectionFactoryImpl.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/jaxr/scout/ManagedConnectionFactoryImpl.java rename to jonas/src/org/objectweb/jonas/jaxr/scout/ManagedConnectionFactoryImpl.java diff --git a/jonas/jonas/src/org/objectweb/jonas/jaxr/scout/jonas-ra.xml b/jonas/src/org/objectweb/jonas/jaxr/scout/jonas-ra.xml similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/jaxr/scout/jonas-ra.xml rename to jonas/src/org/objectweb/jonas/jaxr/scout/jonas-ra.xml diff --git a/jonas/jonas/src/org/objectweb/jonas/jaxr/scout/ra.xml b/jonas/src/org/objectweb/jonas/jaxr/scout/ra.xml similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/jaxr/scout/ra.xml rename to jonas/src/org/objectweb/jonas/jaxr/scout/ra.xml diff --git a/jonas/jonas/src/org/objectweb/jonas/jdbc/ConnectionImpl.java b/jonas/src/org/objectweb/jonas/jdbc/ConnectionImpl.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/jdbc/ConnectionImpl.java rename to jonas/src/org/objectweb/jonas/jdbc/ConnectionImpl.java diff --git a/jonas/jonas/src/org/objectweb/jonas/jdbc/ConnectionManagerImpl.java b/jonas/src/org/objectweb/jonas/jdbc/ConnectionManagerImpl.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/jdbc/ConnectionManagerImpl.java rename to jonas/src/org/objectweb/jonas/jdbc/ConnectionManagerImpl.java diff --git a/jonas/jonas/src/org/objectweb/jonas/jdbc/ConnectionPoolMCFImpl.java b/jonas/src/org/objectweb/jonas/jdbc/ConnectionPoolMCFImpl.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/jdbc/ConnectionPoolMCFImpl.java rename to jonas/src/org/objectweb/jonas/jdbc/ConnectionPoolMCFImpl.java diff --git a/jonas/jonas/src/org/objectweb/jonas/jdbc/ConnectionRequestInfoImpl.java b/jonas/src/org/objectweb/jonas/jdbc/ConnectionRequestInfoImpl.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/jdbc/ConnectionRequestInfoImpl.java rename to jonas/src/org/objectweb/jonas/jdbc/ConnectionRequestInfoImpl.java diff --git a/jonas/jonas/src/org/objectweb/jonas/jdbc/DataSourceImpl.java b/jonas/src/org/objectweb/jonas/jdbc/DataSourceImpl.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/jdbc/DataSourceImpl.java rename to jonas/src/org/objectweb/jonas/jdbc/DataSourceImpl.java diff --git a/jonas/jonas/src/org/objectweb/jonas/jdbc/DataSourceMCFImpl.java b/jonas/src/org/objectweb/jonas/jdbc/DataSourceMCFImpl.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/jdbc/DataSourceMCFImpl.java rename to jonas/src/org/objectweb/jonas/jdbc/DataSourceMCFImpl.java diff --git a/jonas/jonas/src/org/objectweb/jonas/jdbc/DriverManagerMCFImpl.java b/jonas/src/org/objectweb/jonas/jdbc/DriverManagerMCFImpl.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/jdbc/DriverManagerMCFImpl.java rename to jonas/src/org/objectweb/jonas/jdbc/DriverManagerMCFImpl.java diff --git a/jonas/jonas/src/org/objectweb/jonas/jdbc/DriverWrapper.java b/jonas/src/org/objectweb/jonas/jdbc/DriverWrapper.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/jdbc/DriverWrapper.java rename to jonas/src/org/objectweb/jonas/jdbc/DriverWrapper.java diff --git a/jonas/jonas/src/org/objectweb/jonas/jdbc/MCFData.java b/jonas/src/org/objectweb/jonas/jdbc/MCFData.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/jdbc/MCFData.java rename to jonas/src/org/objectweb/jonas/jdbc/MCFData.java diff --git a/jonas/jonas/src/org/objectweb/jonas/jdbc/ManagedConnectionFactoryImpl.java b/jonas/src/org/objectweb/jonas/jdbc/ManagedConnectionFactoryImpl.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/jdbc/ManagedConnectionFactoryImpl.java rename to jonas/src/org/objectweb/jonas/jdbc/ManagedConnectionFactoryImpl.java diff --git a/jonas/jonas/src/org/objectweb/jonas/jdbc/ManagedConnectionImpl.java b/jonas/src/org/objectweb/jonas/jdbc/ManagedConnectionImpl.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/jdbc/ManagedConnectionImpl.java rename to jonas/src/org/objectweb/jonas/jdbc/ManagedConnectionImpl.java diff --git a/jonas/jonas/src/org/objectweb/jonas/jdbc/MetaDataImpl.java b/jonas/src/org/objectweb/jonas/jdbc/MetaDataImpl.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/jdbc/MetaDataImpl.java rename to jonas/src/org/objectweb/jonas/jdbc/MetaDataImpl.java diff --git a/jonas/jonas/src/org/objectweb/jonas/jdbc/Utility.java b/jonas/src/org/objectweb/jonas/jdbc/Utility.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/jdbc/Utility.java rename to jonas/src/org/objectweb/jonas/jdbc/Utility.java diff --git a/jonas/jonas/src/org/objectweb/jonas/jdbc/XAMCFImpl.java b/jonas/src/org/objectweb/jonas/jdbc/XAMCFImpl.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/jdbc/XAMCFImpl.java rename to jonas/src/org/objectweb/jonas/jdbc/XAMCFImpl.java diff --git a/jonas/jonas/src/org/objectweb/jonas/jdbc/XAResourceImpl.java b/jonas/src/org/objectweb/jonas/jdbc/XAResourceImpl.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/jdbc/XAResourceImpl.java rename to jonas/src/org/objectweb/jonas/jdbc/XAResourceImpl.java diff --git a/jonas/jonas/src/org/objectweb/jonas/jdbc/xml/CP/META-INF/jonas-ra.xml b/jonas/src/org/objectweb/jonas/jdbc/xml/CP/META-INF/jonas-ra.xml similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/jdbc/xml/CP/META-INF/jonas-ra.xml rename to jonas/src/org/objectweb/jonas/jdbc/xml/CP/META-INF/jonas-ra.xml diff --git a/jonas/jonas/src/org/objectweb/jonas/jdbc/xml/CP/META-INF/ra.xml b/jonas/src/org/objectweb/jonas/jdbc/xml/CP/META-INF/ra.xml similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/jdbc/xml/CP/META-INF/ra.xml rename to jonas/src/org/objectweb/jonas/jdbc/xml/CP/META-INF/ra.xml diff --git a/jonas/jonas/src/org/objectweb/jonas/jdbc/xml/DM/META-INF/jonas-ra.xml b/jonas/src/org/objectweb/jonas/jdbc/xml/DM/META-INF/jonas-ra.xml similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/jdbc/xml/DM/META-INF/jonas-ra.xml rename to jonas/src/org/objectweb/jonas/jdbc/xml/DM/META-INF/jonas-ra.xml diff --git a/jonas/jonas/src/org/objectweb/jonas/jdbc/xml/DM/META-INF/ra.xml b/jonas/src/org/objectweb/jonas/jdbc/xml/DM/META-INF/ra.xml similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/jdbc/xml/DM/META-INF/ra.xml rename to jonas/src/org/objectweb/jonas/jdbc/xml/DM/META-INF/ra.xml diff --git a/jonas/jonas/src/org/objectweb/jonas/jdbc/xml/DS/META-INF/jonas-ra.xml b/jonas/src/org/objectweb/jonas/jdbc/xml/DS/META-INF/jonas-ra.xml similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/jdbc/xml/DS/META-INF/jonas-ra.xml rename to jonas/src/org/objectweb/jonas/jdbc/xml/DS/META-INF/jonas-ra.xml diff --git a/jonas/jonas/src/org/objectweb/jonas/jdbc/xml/DS/META-INF/ra.xml b/jonas/src/org/objectweb/jonas/jdbc/xml/DS/META-INF/ra.xml similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/jdbc/xml/DS/META-INF/ra.xml rename to jonas/src/org/objectweb/jonas/jdbc/xml/DS/META-INF/ra.xml diff --git a/jonas/jonas/src/org/objectweb/jonas/jdbc/xml/XA/META-INF/jonas-ra.xml b/jonas/src/org/objectweb/jonas/jdbc/xml/XA/META-INF/jonas-ra.xml similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/jdbc/xml/XA/META-INF/jonas-ra.xml rename to jonas/src/org/objectweb/jonas/jdbc/xml/XA/META-INF/jonas-ra.xml diff --git a/jonas/jonas/src/org/objectweb/jonas/jdbc/xml/XA/META-INF/ra.xml b/jonas/src/org/objectweb/jonas/jdbc/xml/XA/META-INF/ra.xml similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/jdbc/xml/XA/META-INF/ra.xml rename to jonas/src/org/objectweb/jonas/jdbc/xml/XA/META-INF/ra.xml diff --git a/jonas/jonas/src/org/objectweb/jonas/jms/JmsService.java b/jonas/src/org/objectweb/jonas/jms/JmsService.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/jms/JmsService.java rename to jonas/src/org/objectweb/jonas/jms/JmsService.java diff --git a/jonas/jonas/src/org/objectweb/jonas/jms/JmsServiceImpl.java b/jonas/src/org/objectweb/jonas/jms/JmsServiceImpl.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/jms/JmsServiceImpl.java rename to jonas/src/org/objectweb/jonas/jms/JmsServiceImpl.java diff --git a/jonas/jonas/src/org/objectweb/jonas/jms/JmsServiceImplMBean.java b/jonas/src/org/objectweb/jonas/jms/JmsServiceImplMBean.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/jms/JmsServiceImplMBean.java rename to jonas/src/org/objectweb/jonas/jms/JmsServiceImplMBean.java diff --git a/jonas/jonas/src/org/objectweb/jonas/jmx/AbsJmxServiceImpl.java b/jonas/src/org/objectweb/jonas/jmx/AbsJmxServiceImpl.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/jmx/AbsJmxServiceImpl.java rename to jonas/src/org/objectweb/jonas/jmx/AbsJmxServiceImpl.java diff --git a/jonas/jonas/src/org/objectweb/jonas/jmx/CatalinaObjectName.java b/jonas/src/org/objectweb/jonas/jmx/CatalinaObjectName.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/jmx/CatalinaObjectName.java rename to jonas/src/org/objectweb/jonas/jmx/CatalinaObjectName.java diff --git a/jonas/jonas/src/org/objectweb/jonas/jmx/ConnectorFactory.java b/jonas/src/org/objectweb/jonas/jmx/ConnectorFactory.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/jmx/ConnectorFactory.java rename to jonas/src/org/objectweb/jonas/jmx/ConnectorFactory.java diff --git a/jonas/jonas/src/org/objectweb/jonas/jmx/J2eeObjectName.java b/jonas/src/org/objectweb/jonas/jmx/J2eeObjectName.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/jmx/J2eeObjectName.java rename to jonas/src/org/objectweb/jonas/jmx/J2eeObjectName.java diff --git a/jonas/jonas/src/org/objectweb/jonas/jmx/JmxService.java b/jonas/src/org/objectweb/jonas/jmx/JmxService.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/jmx/JmxService.java rename to jonas/src/org/objectweb/jonas/jmx/JmxService.java diff --git a/jonas/jonas/src/org/objectweb/jonas/jmx/JmxServiceImpl.java b/jonas/src/org/objectweb/jonas/jmx/JmxServiceImpl.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/jmx/JmxServiceImpl.java rename to jonas/src/org/objectweb/jonas/jmx/JmxServiceImpl.java diff --git a/jonas/jonas/src/org/objectweb/jonas/jmx/JonasManagementRepr.java b/jonas/src/org/objectweb/jonas/jmx/JonasManagementRepr.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/jmx/JonasManagementRepr.java rename to jonas/src/org/objectweb/jonas/jmx/JonasManagementRepr.java diff --git a/jonas/jonas/src/org/objectweb/jonas/jmx/JonasObjectName.java b/jonas/src/org/objectweb/jonas/jmx/JonasObjectName.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/jmx/JonasObjectName.java rename to jonas/src/org/objectweb/jonas/jmx/JonasObjectName.java diff --git a/jonas/jonas/src/org/objectweb/jonas/jmx/JoramObjectName.java b/jonas/src/org/objectweb/jonas/jmx/JoramObjectName.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/jmx/JoramObjectName.java rename to jonas/src/org/objectweb/jonas/jmx/JoramObjectName.java diff --git a/jonas/jonas/src/org/objectweb/jonas/jmx/ManagementException.java b/jonas/src/org/objectweb/jonas/jmx/ManagementException.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/jmx/ManagementException.java rename to jonas/src/org/objectweb/jonas/jmx/ManagementException.java diff --git a/jonas/jonas/src/org/objectweb/jonas/jmx/ManagementRepr.java b/jonas/src/org/objectweb/jonas/jmx/ManagementRepr.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/jmx/ManagementRepr.java rename to jonas/src/org/objectweb/jonas/jmx/ManagementRepr.java diff --git a/jonas/jonas/src/org/objectweb/jonas/jmx/ManagementReprFactory.java b/jonas/src/org/objectweb/jonas/jmx/ManagementReprFactory.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/jmx/ManagementReprFactory.java rename to jonas/src/org/objectweb/jonas/jmx/ManagementReprFactory.java diff --git a/jonas/jonas/src/org/objectweb/jonas/jmx/ManagementReprImpl.java b/jonas/src/org/objectweb/jonas/jmx/ManagementReprImpl.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/jmx/ManagementReprImpl.java rename to jonas/src/org/objectweb/jonas/jmx/ManagementReprImpl.java diff --git a/jonas/jonas/src/org/objectweb/jonas/jmx/ManagementReprImplJSR160.java b/jonas/src/org/objectweb/jonas/jmx/ManagementReprImplJSR160.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/jmx/ManagementReprImplJSR160.java rename to jonas/src/org/objectweb/jonas/jmx/ManagementReprImplJSR160.java diff --git a/jonas/jonas/src/org/objectweb/jonas/jmx/ManagementReprLoader.java b/jonas/src/org/objectweb/jonas/jmx/ManagementReprLoader.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/jmx/ManagementReprLoader.java rename to jonas/src/org/objectweb/jonas/jmx/ManagementReprLoader.java diff --git a/jonas/jonas/src/org/objectweb/jonas/jmx/RMIConnector.java b/jonas/src/org/objectweb/jonas/jmx/RMIConnector.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/jmx/RMIConnector.java rename to jonas/src/org/objectweb/jonas/jmx/RMIConnector.java diff --git a/jonas/jonas/src/org/objectweb/jonas/jmx/RMIConnectorImpl.java b/jonas/src/org/objectweb/jonas/jmx/RMIConnectorImpl.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/jmx/RMIConnectorImpl.java rename to jonas/src/org/objectweb/jonas/jmx/RMIConnectorImpl.java diff --git a/jonas/jonas/src/org/objectweb/jonas/jmx/commons/JMXRemoteException.java b/jonas/src/org/objectweb/jonas/jmx/commons/JMXRemoteException.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/jmx/commons/JMXRemoteException.java rename to jonas/src/org/objectweb/jonas/jmx/commons/JMXRemoteException.java diff --git a/jonas/jonas/src/org/objectweb/jonas/jmx/commons/JMXRemoteHelper.java b/jonas/src/org/objectweb/jonas/jmx/commons/JMXRemoteHelper.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/jmx/commons/JMXRemoteHelper.java rename to jonas/src/org/objectweb/jonas/jmx/commons/JMXRemoteHelper.java diff --git a/jonas/jonas/src/org/objectweb/jonas/jmx/commons/MBeanServerException.java b/jonas/src/org/objectweb/jonas/jmx/commons/MBeanServerException.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/jmx/commons/MBeanServerException.java rename to jonas/src/org/objectweb/jonas/jmx/commons/MBeanServerException.java diff --git a/jonas/jonas/src/org/objectweb/jonas/jmx/commons/MBeanServerHelper.java b/jonas/src/org/objectweb/jonas/jmx/commons/MBeanServerHelper.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/jmx/commons/MBeanServerHelper.java rename to jonas/src/org/objectweb/jonas/jmx/commons/MBeanServerHelper.java diff --git a/jonas/jonas/src/org/objectweb/jonas/jtm/JTAResource.java b/jonas/src/org/objectweb/jonas/jtm/JTAResource.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/jtm/JTAResource.java rename to jonas/src/org/objectweb/jonas/jtm/JTAResource.java diff --git a/jonas/jonas/src/org/objectweb/jonas/jtm/JTAResourceMBean.java b/jonas/src/org/objectweb/jonas/jtm/JTAResourceMBean.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/jtm/JTAResourceMBean.java rename to jonas/src/org/objectweb/jonas/jtm/JTAResourceMBean.java diff --git a/jonas/jonas/src/org/objectweb/jonas/jtm/README b/jonas/src/org/objectweb/jonas/jtm/README similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/jtm/README rename to jonas/src/org/objectweb/jonas/jtm/README diff --git a/jonas/jonas/src/org/objectweb/jonas/jtm/TransactionService.java b/jonas/src/org/objectweb/jonas/jtm/TransactionService.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/jtm/TransactionService.java rename to jonas/src/org/objectweb/jonas/jtm/TransactionService.java diff --git a/jonas/jonas/src/org/objectweb/jonas/jtm/TransactionServiceImpl.java b/jonas/src/org/objectweb/jonas/jtm/TransactionServiceImpl.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/jtm/TransactionServiceImpl.java rename to jonas/src/org/objectweb/jonas/jtm/TransactionServiceImpl.java diff --git a/jonas/jonas/src/org/objectweb/jonas/jtm/TransactionServiceImplMBean.java b/jonas/src/org/objectweb/jonas/jtm/TransactionServiceImplMBean.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/jtm/TransactionServiceImplMBean.java rename to jonas/src/org/objectweb/jonas/jtm/TransactionServiceImplMBean.java diff --git a/jonas/jonas/src/org/objectweb/jonas/jtm/mbeans-descriptors.xml b/jonas/src/org/objectweb/jonas/jtm/mbeans-descriptors.xml similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/jtm/mbeans-descriptors.xml rename to jonas/src/org/objectweb/jonas/jtm/mbeans-descriptors.xml diff --git a/jonas/jonas/src/org/objectweb/jonas/mail/MailService.java b/jonas/src/org/objectweb/jonas/mail/MailService.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/mail/MailService.java rename to jonas/src/org/objectweb/jonas/mail/MailService.java diff --git a/jonas/jonas/src/org/objectweb/jonas/mail/MailServiceException.java b/jonas/src/org/objectweb/jonas/mail/MailServiceException.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/mail/MailServiceException.java rename to jonas/src/org/objectweb/jonas/mail/MailServiceException.java diff --git a/jonas/jonas/src/org/objectweb/jonas/mail/MailServiceImpl.java b/jonas/src/org/objectweb/jonas/mail/MailServiceImpl.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/mail/MailServiceImpl.java rename to jonas/src/org/objectweb/jonas/mail/MailServiceImpl.java diff --git a/jonas/jonas/src/org/objectweb/jonas/mail/MailServiceImplMBean.java b/jonas/src/org/objectweb/jonas/mail/MailServiceImplMBean.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/mail/MailServiceImplMBean.java rename to jonas/src/org/objectweb/jonas/mail/MailServiceImplMBean.java diff --git a/jonas/jonas/src/org/objectweb/jonas/mail/factory/JavaMail.java b/jonas/src/org/objectweb/jonas/mail/factory/JavaMail.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/mail/factory/JavaMail.java rename to jonas/src/org/objectweb/jonas/mail/factory/JavaMail.java diff --git a/jonas/jonas/src/org/objectweb/jonas/mail/factory/JavaMailMimePartDS.java b/jonas/src/org/objectweb/jonas/mail/factory/JavaMailMimePartDS.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/mail/factory/JavaMailMimePartDS.java rename to jonas/src/org/objectweb/jonas/mail/factory/JavaMailMimePartDS.java diff --git a/jonas/jonas/src/org/objectweb/jonas/mail/factory/JavaMailMimePartDSFactory.java b/jonas/src/org/objectweb/jonas/mail/factory/JavaMailMimePartDSFactory.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/mail/factory/JavaMailMimePartDSFactory.java rename to jonas/src/org/objectweb/jonas/mail/factory/JavaMailMimePartDSFactory.java diff --git a/jonas/jonas/src/org/objectweb/jonas/mail/factory/JavaMailMimePartDSResource.java b/jonas/src/org/objectweb/jonas/mail/factory/JavaMailMimePartDSResource.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/mail/factory/JavaMailMimePartDSResource.java rename to jonas/src/org/objectweb/jonas/mail/factory/JavaMailMimePartDSResource.java diff --git a/jonas/jonas/src/org/objectweb/jonas/mail/factory/JavaMailMimePartDSResourceMBean.java b/jonas/src/org/objectweb/jonas/mail/factory/JavaMailMimePartDSResourceMBean.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/mail/factory/JavaMailMimePartDSResourceMBean.java rename to jonas/src/org/objectweb/jonas/mail/factory/JavaMailMimePartDSResourceMBean.java diff --git a/jonas/jonas/src/org/objectweb/jonas/mail/factory/JavaMailResource.java b/jonas/src/org/objectweb/jonas/mail/factory/JavaMailResource.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/mail/factory/JavaMailResource.java rename to jonas/src/org/objectweb/jonas/mail/factory/JavaMailResource.java diff --git a/jonas/jonas/src/org/objectweb/jonas/mail/factory/JavaMailResourceMBean.java b/jonas/src/org/objectweb/jonas/mail/factory/JavaMailResourceMBean.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/mail/factory/JavaMailResourceMBean.java rename to jonas/src/org/objectweb/jonas/mail/factory/JavaMailResourceMBean.java diff --git a/jonas/jonas/src/org/objectweb/jonas/mail/factory/JavaMailSession.java b/jonas/src/org/objectweb/jonas/mail/factory/JavaMailSession.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/mail/factory/JavaMailSession.java rename to jonas/src/org/objectweb/jonas/mail/factory/JavaMailSession.java diff --git a/jonas/jonas/src/org/objectweb/jonas/mail/factory/JavaMailSessionFactory.java b/jonas/src/org/objectweb/jonas/mail/factory/JavaMailSessionFactory.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/mail/factory/JavaMailSessionFactory.java rename to jonas/src/org/objectweb/jonas/mail/factory/JavaMailSessionFactory.java diff --git a/jonas/jonas/src/org/objectweb/jonas/mail/factory/JavaMailSessionResource.java b/jonas/src/org/objectweb/jonas/mail/factory/JavaMailSessionResource.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/mail/factory/JavaMailSessionResource.java rename to jonas/src/org/objectweb/jonas/mail/factory/JavaMailSessionResource.java diff --git a/jonas/jonas/src/org/objectweb/jonas/mail/factory/JavaMailSessionResourceMBean.java b/jonas/src/org/objectweb/jonas/mail/factory/JavaMailSessionResourceMBean.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/mail/factory/JavaMailSessionResourceMBean.java rename to jonas/src/org/objectweb/jonas/mail/factory/JavaMailSessionResourceMBean.java diff --git a/jonas/jonas/src/org/objectweb/jonas/mail/lib/JAuthenticator.java b/jonas/src/org/objectweb/jonas/mail/lib/JAuthenticator.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/mail/lib/JAuthenticator.java rename to jonas/src/org/objectweb/jonas/mail/lib/JAuthenticator.java diff --git a/jonas/jonas/src/org/objectweb/jonas/mail/mbeans-descriptors.xml b/jonas/src/org/objectweb/jonas/mail/mbeans-descriptors.xml similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/mail/mbeans-descriptors.xml rename to jonas/src/org/objectweb/jonas/mail/mbeans-descriptors.xml diff --git a/jonas/jonas/src/org/objectweb/jonas/management/AbsReconfigurator.java b/jonas/src/org/objectweb/jonas/management/AbsReconfigurator.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/management/AbsReconfigurator.java rename to jonas/src/org/objectweb/jonas/management/AbsReconfigurator.java diff --git a/jonas/jonas/src/org/objectweb/jonas/management/AttributeAddNotification.java b/jonas/src/org/objectweb/jonas/management/AttributeAddNotification.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/management/AttributeAddNotification.java rename to jonas/src/org/objectweb/jonas/management/AttributeAddNotification.java diff --git a/jonas/jonas/src/org/objectweb/jonas/management/AttributeRemoveNotification.java b/jonas/src/org/objectweb/jonas/management/AttributeRemoveNotification.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/management/AttributeRemoveNotification.java rename to jonas/src/org/objectweb/jonas/management/AttributeRemoveNotification.java diff --git a/jonas/jonas/src/org/objectweb/jonas/management/JonasMBeanTools.java b/jonas/src/org/objectweb/jonas/management/JonasMBeanTools.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/management/JonasMBeanTools.java rename to jonas/src/org/objectweb/jonas/management/JonasMBeanTools.java diff --git a/jonas/jonas/src/org/objectweb/jonas/management/JonasNotificationListener.java b/jonas/src/org/objectweb/jonas/management/JonasNotificationListener.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/management/JonasNotificationListener.java rename to jonas/src/org/objectweb/jonas/management/JonasNotificationListener.java diff --git a/jonas/jonas/src/org/objectweb/jonas/management/ListenerJavaBean.java b/jonas/src/org/objectweb/jonas/management/ListenerJavaBean.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/management/ListenerJavaBean.java rename to jonas/src/org/objectweb/jonas/management/ListenerJavaBean.java diff --git a/jonas/jonas/src/org/objectweb/jonas/management/ReconfigDispatcher.java b/jonas/src/org/objectweb/jonas/management/ReconfigDispatcher.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/management/ReconfigDispatcher.java rename to jonas/src/org/objectweb/jonas/management/ReconfigDispatcher.java diff --git a/jonas/jonas/src/org/objectweb/jonas/management/ReconfigDispatcherMBean.java b/jonas/src/org/objectweb/jonas/management/ReconfigDispatcherMBean.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/management/ReconfigDispatcherMBean.java rename to jonas/src/org/objectweb/jonas/management/ReconfigDispatcherMBean.java diff --git a/jonas/jonas/src/org/objectweb/jonas/management/ReconfigException.java b/jonas/src/org/objectweb/jonas/management/ReconfigException.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/management/ReconfigException.java rename to jonas/src/org/objectweb/jonas/management/ReconfigException.java diff --git a/jonas/jonas/src/org/objectweb/jonas/management/ReconfigManager.java b/jonas/src/org/objectweb/jonas/management/ReconfigManager.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/management/ReconfigManager.java rename to jonas/src/org/objectweb/jonas/management/ReconfigManager.java diff --git a/jonas/jonas/src/org/objectweb/jonas/management/ReconfigManagerMBean.java b/jonas/src/org/objectweb/jonas/management/ReconfigManagerMBean.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/management/ReconfigManagerMBean.java rename to jonas/src/org/objectweb/jonas/management/ReconfigManagerMBean.java diff --git a/jonas/jonas/src/org/objectweb/jonas/management/Reconfigurator.java b/jonas/src/org/objectweb/jonas/management/Reconfigurator.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/management/Reconfigurator.java rename to jonas/src/org/objectweb/jonas/management/Reconfigurator.java diff --git a/jonas/jonas/src/org/objectweb/jonas/management/ReconfiguratorProp.java b/jonas/src/org/objectweb/jonas/management/ReconfiguratorProp.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/management/ReconfiguratorProp.java rename to jonas/src/org/objectweb/jonas/management/ReconfiguratorProp.java diff --git a/jonas/jonas/src/org/objectweb/jonas/management/ReconfiguratorXml.java b/jonas/src/org/objectweb/jonas/management/ReconfiguratorXml.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/management/ReconfiguratorXml.java rename to jonas/src/org/objectweb/jonas/management/ReconfiguratorXml.java diff --git a/jonas/jonas/src/org/objectweb/jonas/management/Reconfigured.java b/jonas/src/org/objectweb/jonas/management/Reconfigured.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/management/Reconfigured.java rename to jonas/src/org/objectweb/jonas/management/Reconfigured.java diff --git a/jonas/jonas/src/org/objectweb/jonas/management/ReconfiguredProp.java b/jonas/src/org/objectweb/jonas/management/ReconfiguredProp.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/management/ReconfiguredProp.java rename to jonas/src/org/objectweb/jonas/management/ReconfiguredProp.java diff --git a/jonas/jonas/src/org/objectweb/jonas/management/ReconfiguredXml.java b/jonas/src/org/objectweb/jonas/management/ReconfiguredXml.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/management/ReconfiguredXml.java rename to jonas/src/org/objectweb/jonas/management/ReconfiguredXml.java diff --git a/jonas/jonas/src/org/objectweb/jonas/management/cluster/BaseCluster.java b/jonas/src/org/objectweb/jonas/management/cluster/BaseCluster.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/management/cluster/BaseCluster.java rename to jonas/src/org/objectweb/jonas/management/cluster/BaseCluster.java diff --git a/jonas/jonas/src/org/objectweb/jonas/management/cluster/BaseClusterMBean.java b/jonas/src/org/objectweb/jonas/management/cluster/BaseClusterMBean.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/management/cluster/BaseClusterMBean.java rename to jonas/src/org/objectweb/jonas/management/cluster/BaseClusterMBean.java diff --git a/jonas/jonas/src/org/objectweb/jonas/management/cluster/ClusterFactory.java b/jonas/src/org/objectweb/jonas/management/cluster/ClusterFactory.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/management/cluster/ClusterFactory.java rename to jonas/src/org/objectweb/jonas/management/cluster/ClusterFactory.java diff --git a/jonas/jonas/src/org/objectweb/jonas/management/cluster/ClusterMember.java b/jonas/src/org/objectweb/jonas/management/cluster/ClusterMember.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/management/cluster/ClusterMember.java rename to jonas/src/org/objectweb/jonas/management/cluster/ClusterMember.java diff --git a/jonas/jonas/src/org/objectweb/jonas/management/cluster/ClusterMemberMBean.java b/jonas/src/org/objectweb/jonas/management/cluster/ClusterMemberMBean.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/management/cluster/ClusterMemberMBean.java rename to jonas/src/org/objectweb/jonas/management/cluster/ClusterMemberMBean.java diff --git a/jonas/jonas/src/org/objectweb/jonas/management/cluster/CmiCluster.java b/jonas/src/org/objectweb/jonas/management/cluster/CmiCluster.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/management/cluster/CmiCluster.java rename to jonas/src/org/objectweb/jonas/management/cluster/CmiCluster.java diff --git a/jonas/jonas/src/org/objectweb/jonas/management/cluster/CmiClusterFactory.java b/jonas/src/org/objectweb/jonas/management/cluster/CmiClusterFactory.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/management/cluster/CmiClusterFactory.java rename to jonas/src/org/objectweb/jonas/management/cluster/CmiClusterFactory.java diff --git a/jonas/jonas/src/org/objectweb/jonas/management/cluster/CmiClusterMBean.java b/jonas/src/org/objectweb/jonas/management/cluster/CmiClusterMBean.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/management/cluster/CmiClusterMBean.java rename to jonas/src/org/objectweb/jonas/management/cluster/CmiClusterMBean.java diff --git a/jonas/jonas/src/org/objectweb/jonas/management/cluster/CmiClusterMember.java b/jonas/src/org/objectweb/jonas/management/cluster/CmiClusterMember.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/management/cluster/CmiClusterMember.java rename to jonas/src/org/objectweb/jonas/management/cluster/CmiClusterMember.java diff --git a/jonas/jonas/src/org/objectweb/jonas/management/cluster/CmiClusterMemberMBean.java b/jonas/src/org/objectweb/jonas/management/cluster/CmiClusterMemberMBean.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/management/cluster/CmiClusterMemberMBean.java rename to jonas/src/org/objectweb/jonas/management/cluster/CmiClusterMemberMBean.java diff --git a/jonas/jonas/src/org/objectweb/jonas/management/cluster/EjbHaCluster.java b/jonas/src/org/objectweb/jonas/management/cluster/EjbHaCluster.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/management/cluster/EjbHaCluster.java rename to jonas/src/org/objectweb/jonas/management/cluster/EjbHaCluster.java diff --git a/jonas/jonas/src/org/objectweb/jonas/management/cluster/EjbHaClusterFactory.java b/jonas/src/org/objectweb/jonas/management/cluster/EjbHaClusterFactory.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/management/cluster/EjbHaClusterFactory.java rename to jonas/src/org/objectweb/jonas/management/cluster/EjbHaClusterFactory.java diff --git a/jonas/jonas/src/org/objectweb/jonas/management/cluster/EjbHaClusterMBean.java b/jonas/src/org/objectweb/jonas/management/cluster/EjbHaClusterMBean.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/management/cluster/EjbHaClusterMBean.java rename to jonas/src/org/objectweb/jonas/management/cluster/EjbHaClusterMBean.java diff --git a/jonas/jonas/src/org/objectweb/jonas/management/cluster/EjbHaClusterMember.java b/jonas/src/org/objectweb/jonas/management/cluster/EjbHaClusterMember.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/management/cluster/EjbHaClusterMember.java rename to jonas/src/org/objectweb/jonas/management/cluster/EjbHaClusterMember.java diff --git a/jonas/jonas/src/org/objectweb/jonas/management/cluster/EjbHaClusterMemberMBean.java b/jonas/src/org/objectweb/jonas/management/cluster/EjbHaClusterMemberMBean.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/management/cluster/EjbHaClusterMemberMBean.java rename to jonas/src/org/objectweb/jonas/management/cluster/EjbHaClusterMemberMBean.java diff --git a/jonas/jonas/src/org/objectweb/jonas/management/cluster/JkCluster.java b/jonas/src/org/objectweb/jonas/management/cluster/JkCluster.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/management/cluster/JkCluster.java rename to jonas/src/org/objectweb/jonas/management/cluster/JkCluster.java diff --git a/jonas/jonas/src/org/objectweb/jonas/management/cluster/JkClusterFactory.java b/jonas/src/org/objectweb/jonas/management/cluster/JkClusterFactory.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/management/cluster/JkClusterFactory.java rename to jonas/src/org/objectweb/jonas/management/cluster/JkClusterFactory.java diff --git a/jonas/jonas/src/org/objectweb/jonas/management/cluster/JkClusterMBean.java b/jonas/src/org/objectweb/jonas/management/cluster/JkClusterMBean.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/management/cluster/JkClusterMBean.java rename to jonas/src/org/objectweb/jonas/management/cluster/JkClusterMBean.java diff --git a/jonas/jonas/src/org/objectweb/jonas/management/cluster/JkClusterMember.java b/jonas/src/org/objectweb/jonas/management/cluster/JkClusterMember.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/management/cluster/JkClusterMember.java rename to jonas/src/org/objectweb/jonas/management/cluster/JkClusterMember.java diff --git a/jonas/jonas/src/org/objectweb/jonas/management/cluster/JkClusterMemberMBean.java b/jonas/src/org/objectweb/jonas/management/cluster/JkClusterMemberMBean.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/management/cluster/JkClusterMemberMBean.java rename to jonas/src/org/objectweb/jonas/management/cluster/JkClusterMemberMBean.java diff --git a/jonas/jonas/src/org/objectweb/jonas/management/cluster/LogicalCluster.java b/jonas/src/org/objectweb/jonas/management/cluster/LogicalCluster.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/management/cluster/LogicalCluster.java rename to jonas/src/org/objectweb/jonas/management/cluster/LogicalCluster.java diff --git a/jonas/jonas/src/org/objectweb/jonas/management/cluster/LogicalClusterFactory.java b/jonas/src/org/objectweb/jonas/management/cluster/LogicalClusterFactory.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/management/cluster/LogicalClusterFactory.java rename to jonas/src/org/objectweb/jonas/management/cluster/LogicalClusterFactory.java diff --git a/jonas/jonas/src/org/objectweb/jonas/management/cluster/LogicalClusterMember.java b/jonas/src/org/objectweb/jonas/management/cluster/LogicalClusterMember.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/management/cluster/LogicalClusterMember.java rename to jonas/src/org/objectweb/jonas/management/cluster/LogicalClusterMember.java diff --git a/jonas/jonas/src/org/objectweb/jonas/management/cluster/LogicalClusterMemberMBean.java b/jonas/src/org/objectweb/jonas/management/cluster/LogicalClusterMemberMBean.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/management/cluster/LogicalClusterMemberMBean.java rename to jonas/src/org/objectweb/jonas/management/cluster/LogicalClusterMemberMBean.java diff --git a/jonas/jonas/src/org/objectweb/jonas/management/cluster/TomcatCluster.java b/jonas/src/org/objectweb/jonas/management/cluster/TomcatCluster.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/management/cluster/TomcatCluster.java rename to jonas/src/org/objectweb/jonas/management/cluster/TomcatCluster.java diff --git a/jonas/jonas/src/org/objectweb/jonas/management/cluster/TomcatClusterFactory.java b/jonas/src/org/objectweb/jonas/management/cluster/TomcatClusterFactory.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/management/cluster/TomcatClusterFactory.java rename to jonas/src/org/objectweb/jonas/management/cluster/TomcatClusterFactory.java diff --git a/jonas/jonas/src/org/objectweb/jonas/management/cluster/TomcatClusterMBean.java b/jonas/src/org/objectweb/jonas/management/cluster/TomcatClusterMBean.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/management/cluster/TomcatClusterMBean.java rename to jonas/src/org/objectweb/jonas/management/cluster/TomcatClusterMBean.java diff --git a/jonas/jonas/src/org/objectweb/jonas/management/cluster/TomcatClusterMember.java b/jonas/src/org/objectweb/jonas/management/cluster/TomcatClusterMember.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/management/cluster/TomcatClusterMember.java rename to jonas/src/org/objectweb/jonas/management/cluster/TomcatClusterMember.java diff --git a/jonas/jonas/src/org/objectweb/jonas/management/cluster/TomcatClusterMemberMBean.java b/jonas/src/org/objectweb/jonas/management/cluster/TomcatClusterMemberMBean.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/management/cluster/TomcatClusterMemberMBean.java rename to jonas/src/org/objectweb/jonas/management/cluster/TomcatClusterMemberMBean.java diff --git a/jonas/jonas/src/org/objectweb/jonas/management/j2eemanagement/J2EEDeployedObject.java b/jonas/src/org/objectweb/jonas/management/j2eemanagement/J2EEDeployedObject.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/management/j2eemanagement/J2EEDeployedObject.java rename to jonas/src/org/objectweb/jonas/management/j2eemanagement/J2EEDeployedObject.java diff --git a/jonas/jonas/src/org/objectweb/jonas/management/j2eemanagement/J2EEDomain.java b/jonas/src/org/objectweb/jonas/management/j2eemanagement/J2EEDomain.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/management/j2eemanagement/J2EEDomain.java rename to jonas/src/org/objectweb/jonas/management/j2eemanagement/J2EEDomain.java diff --git a/jonas/jonas/src/org/objectweb/jonas/management/j2eemanagement/J2EEManagedObject.java b/jonas/src/org/objectweb/jonas/management/j2eemanagement/J2EEManagedObject.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/management/j2eemanagement/J2EEManagedObject.java rename to jonas/src/org/objectweb/jonas/management/j2eemanagement/J2EEManagedObject.java diff --git a/jonas/jonas/src/org/objectweb/jonas/management/j2eemanagement/J2EEModule.java b/jonas/src/org/objectweb/jonas/management/j2eemanagement/J2EEModule.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/management/j2eemanagement/J2EEModule.java rename to jonas/src/org/objectweb/jonas/management/j2eemanagement/J2EEModule.java diff --git a/jonas/jonas/src/org/objectweb/jonas/management/j2eemanagement/J2EEResource.java b/jonas/src/org/objectweb/jonas/management/j2eemanagement/J2EEResource.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/management/j2eemanagement/J2EEResource.java rename to jonas/src/org/objectweb/jonas/management/j2eemanagement/J2EEResource.java diff --git a/jonas/jonas/src/org/objectweb/jonas/management/j2eemanagement/ManagementListener.java b/jonas/src/org/objectweb/jonas/management/j2eemanagement/ManagementListener.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/management/j2eemanagement/ManagementListener.java rename to jonas/src/org/objectweb/jonas/management/j2eemanagement/ManagementListener.java diff --git a/jonas/jonas/src/org/objectweb/jonas/management/j2eemanagement/ManagementListenerMBean.java b/jonas/src/org/objectweb/jonas/management/j2eemanagement/ManagementListenerMBean.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/management/j2eemanagement/ManagementListenerMBean.java rename to jonas/src/org/objectweb/jonas/management/j2eemanagement/ManagementListenerMBean.java diff --git a/jonas/jonas/src/org/objectweb/jonas/management/j2eemanagement/ManagementMBeanFilter.java b/jonas/src/org/objectweb/jonas/management/j2eemanagement/ManagementMBeanFilter.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/management/j2eemanagement/ManagementMBeanFilter.java rename to jonas/src/org/objectweb/jonas/management/j2eemanagement/ManagementMBeanFilter.java diff --git a/jonas/jonas/src/org/objectweb/jonas/management/monitoring/ClusterDaemonProxy.java b/jonas/src/org/objectweb/jonas/management/monitoring/ClusterDaemonProxy.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/management/monitoring/ClusterDaemonProxy.java rename to jonas/src/org/objectweb/jonas/management/monitoring/ClusterDaemonProxy.java diff --git a/jonas/jonas/src/org/objectweb/jonas/management/monitoring/ClusterDaemonProxyMBean.java b/jonas/src/org/objectweb/jonas/management/monitoring/ClusterDaemonProxyMBean.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/management/monitoring/ClusterDaemonProxyMBean.java rename to jonas/src/org/objectweb/jonas/management/monitoring/ClusterDaemonProxyMBean.java diff --git a/jonas/jonas/src/org/objectweb/jonas/management/monitoring/DeployAction.java b/jonas/src/org/objectweb/jonas/management/monitoring/DeployAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/management/monitoring/DeployAction.java rename to jonas/src/org/objectweb/jonas/management/monitoring/DeployAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/management/monitoring/DomainMonitor.java b/jonas/src/org/objectweb/jonas/management/monitoring/DomainMonitor.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/management/monitoring/DomainMonitor.java rename to jonas/src/org/objectweb/jonas/management/monitoring/DomainMonitor.java diff --git a/jonas/jonas/src/org/objectweb/jonas/management/monitoring/DomainMonitorMBean.java b/jonas/src/org/objectweb/jonas/management/monitoring/DomainMonitorMBean.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/management/monitoring/DomainMonitorMBean.java rename to jonas/src/org/objectweb/jonas/management/monitoring/DomainMonitorMBean.java diff --git a/jonas/jonas/src/org/objectweb/jonas/management/monitoring/JMXProxy.java b/jonas/src/org/objectweb/jonas/management/monitoring/JMXProxy.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/management/monitoring/JMXProxy.java rename to jonas/src/org/objectweb/jonas/management/monitoring/JMXProxy.java diff --git a/jonas/jonas/src/org/objectweb/jonas/management/monitoring/ServerProxy.java b/jonas/src/org/objectweb/jonas/management/monitoring/ServerProxy.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/management/monitoring/ServerProxy.java rename to jonas/src/org/objectweb/jonas/management/monitoring/ServerProxy.java diff --git a/jonas/jonas/src/org/objectweb/jonas/management/monitoring/ServerProxyMBean.java b/jonas/src/org/objectweb/jonas/management/monitoring/ServerProxyMBean.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/management/monitoring/ServerProxyMBean.java rename to jonas/src/org/objectweb/jonas/management/monitoring/ServerProxyMBean.java diff --git a/jonas/jonas/src/org/objectweb/jonas/mejb/.cvsignore b/jonas/src/org/objectweb/jonas/mejb/.cvsignore similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/mejb/.cvsignore rename to jonas/src/org/objectweb/jonas/mejb/.cvsignore diff --git a/jonas/jonas/src/org/objectweb/jonas/mejb/DomainManagement.java b/jonas/src/org/objectweb/jonas/mejb/DomainManagement.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/mejb/DomainManagement.java rename to jonas/src/org/objectweb/jonas/mejb/DomainManagement.java diff --git a/jonas/jonas/src/org/objectweb/jonas/mejb/DomainManagementHome.java b/jonas/src/org/objectweb/jonas/mejb/DomainManagementHome.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/mejb/DomainManagementHome.java rename to jonas/src/org/objectweb/jonas/mejb/DomainManagementHome.java diff --git a/jonas/jonas/src/org/objectweb/jonas/mejb/ListenerProxy.java b/jonas/src/org/objectweb/jonas/mejb/ListenerProxy.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/mejb/ListenerProxy.java rename to jonas/src/org/objectweb/jonas/mejb/ListenerProxy.java diff --git a/jonas/jonas/src/org/objectweb/jonas/mejb/ListenerProxyImpl.java b/jonas/src/org/objectweb/jonas/mejb/ListenerProxyImpl.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/mejb/ListenerProxyImpl.java rename to jonas/src/org/objectweb/jonas/mejb/ListenerProxyImpl.java diff --git a/jonas/jonas/src/org/objectweb/jonas/mejb/ListenerRegistrationImpl.java b/jonas/src/org/objectweb/jonas/mejb/ListenerRegistrationImpl.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/mejb/ListenerRegistrationImpl.java rename to jonas/src/org/objectweb/jonas/mejb/ListenerRegistrationImpl.java diff --git a/jonas/jonas/src/org/objectweb/jonas/mejb/ManagementBean.java b/jonas/src/org/objectweb/jonas/mejb/ManagementBean.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/mejb/ManagementBean.java rename to jonas/src/org/objectweb/jonas/mejb/ManagementBean.java diff --git a/jonas/jonas/src/org/objectweb/jonas/mejb/ManagementEndpoint.java b/jonas/src/org/objectweb/jonas/mejb/ManagementEndpoint.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/mejb/ManagementEndpoint.java rename to jonas/src/org/objectweb/jonas/mejb/ManagementEndpoint.java diff --git a/jonas/jonas/src/org/objectweb/jonas/mejb/ManagementEndpointException.java b/jonas/src/org/objectweb/jonas/mejb/ManagementEndpointException.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/mejb/ManagementEndpointException.java rename to jonas/src/org/objectweb/jonas/mejb/ManagementEndpointException.java diff --git a/jonas/jonas/src/org/objectweb/jonas/mejb/ManagementEndpointMapping.xml b/jonas/src/org/objectweb/jonas/mejb/ManagementEndpointMapping.xml similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/mejb/ManagementEndpointMapping.xml rename to jonas/src/org/objectweb/jonas/mejb/ManagementEndpointMapping.xml diff --git a/jonas/jonas/src/org/objectweb/jonas/mejb/jonas-mejb.xml b/jonas/src/org/objectweb/jonas/mejb/jonas-mejb.xml similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/mejb/jonas-mejb.xml rename to jonas/src/org/objectweb/jonas/mejb/jonas-mejb.xml diff --git a/jonas/jonas/src/org/objectweb/jonas/mejb/jonas-webservices.xml b/jonas/src/org/objectweb/jonas/mejb/jonas-webservices.xml similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/mejb/jonas-webservices.xml rename to jonas/src/org/objectweb/jonas/mejb/jonas-webservices.xml diff --git a/jonas/jonas/src/org/objectweb/jonas/mejb/mejb.xml b/jonas/src/org/objectweb/jonas/mejb/mejb.xml similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/mejb/mejb.xml rename to jonas/src/org/objectweb/jonas/mejb/mejb.xml diff --git a/jonas/jonas/src/org/objectweb/jonas/mejb/webservices.xml b/jonas/src/org/objectweb/jonas/mejb/webservices.xml similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/mejb/webservices.xml rename to jonas/src/org/objectweb/jonas/mejb/webservices.xml diff --git a/jonas/jonas/src/org/objectweb/jonas/mejb/wsdl/.cvsignore b/jonas/src/org/objectweb/jonas/mejb/wsdl/.cvsignore similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/mejb/wsdl/.cvsignore rename to jonas/src/org/objectweb/jonas/mejb/wsdl/.cvsignore diff --git a/jonas/jonas/src/org/objectweb/jonas/naming/CompNamingContext.java b/jonas/src/org/objectweb/jonas/naming/CompNamingContext.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/naming/CompNamingContext.java rename to jonas/src/org/objectweb/jonas/naming/CompNamingContext.java diff --git a/jonas/jonas/src/org/objectweb/jonas/naming/EJBNameParser.java b/jonas/src/org/objectweb/jonas/naming/EJBNameParser.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/naming/EJBNameParser.java rename to jonas/src/org/objectweb/jonas/naming/EJBNameParser.java diff --git a/jonas/jonas/src/org/objectweb/jonas/naming/NamingManager.java b/jonas/src/org/objectweb/jonas/naming/NamingManager.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/naming/NamingManager.java rename to jonas/src/org/objectweb/jonas/naming/NamingManager.java diff --git a/jonas/jonas/src/org/objectweb/jonas/naming/java/javaURLContext.java b/jonas/src/org/objectweb/jonas/naming/java/javaURLContext.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/naming/java/javaURLContext.java rename to jonas/src/org/objectweb/jonas/naming/java/javaURLContext.java diff --git a/jonas/jonas/src/org/objectweb/jonas/naming/java/javaURLContextFactory.java b/jonas/src/org/objectweb/jonas/naming/java/javaURLContextFactory.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/naming/java/javaURLContextFactory.java rename to jonas/src/org/objectweb/jonas/naming/java/javaURLContextFactory.java diff --git a/jonas/jonas/src/org/objectweb/jonas/newbean/NewBean.java b/jonas/src/org/objectweb/jonas/newbean/NewBean.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/newbean/NewBean.java rename to jonas/src/org/objectweb/jonas/newbean/NewBean.java diff --git a/jonas/jonas/src/org/objectweb/jonas/newbean/Parameter.java b/jonas/src/org/objectweb/jonas/newbean/Parameter.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/newbean/Parameter.java rename to jonas/src/org/objectweb/jonas/newbean/Parameter.java diff --git a/jonas/jonas/src/org/objectweb/jonas/newbean/ParameterSet.java b/jonas/src/org/objectweb/jonas/newbean/ParameterSet.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/newbean/ParameterSet.java rename to jonas/src/org/objectweb/jonas/newbean/ParameterSet.java diff --git a/jonas/jonas/src/org/objectweb/jonas/newbean/bean.vm b/jonas/src/org/objectweb/jonas/newbean/bean.vm similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/newbean/bean.vm rename to jonas/src/org/objectweb/jonas/newbean/bean.vm diff --git a/jonas/jonas/src/org/objectweb/jonas/newbean/build.vm b/jonas/src/org/objectweb/jonas/newbean/build.vm similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/newbean/build.vm rename to jonas/src/org/objectweb/jonas/newbean/build.vm diff --git a/jonas/jonas/src/org/objectweb/jonas/newbean/client.vm b/jonas/src/org/objectweb/jonas/newbean/client.vm similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/newbean/client.vm rename to jonas/src/org/objectweb/jonas/newbean/client.vm diff --git a/jonas/jonas/src/org/objectweb/jonas/newbean/ejb-jar.vm b/jonas/src/org/objectweb/jonas/newbean/ejb-jar.vm similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/newbean/ejb-jar.vm rename to jonas/src/org/objectweb/jonas/newbean/ejb-jar.vm diff --git a/jonas/jonas/src/org/objectweb/jonas/newbean/home.vm b/jonas/src/org/objectweb/jonas/newbean/home.vm similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/newbean/home.vm rename to jonas/src/org/objectweb/jonas/newbean/home.vm diff --git a/jonas/jonas/src/org/objectweb/jonas/newbean/jonas-ejb-jar.vm b/jonas/src/org/objectweb/jonas/newbean/jonas-ejb-jar.vm similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/newbean/jonas-ejb-jar.vm rename to jonas/src/org/objectweb/jonas/newbean/jonas-ejb-jar.vm diff --git a/jonas/jonas/src/org/objectweb/jonas/newbean/newbean.bat b/jonas/src/org/objectweb/jonas/newbean/newbean.bat similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/newbean/newbean.bat rename to jonas/src/org/objectweb/jonas/newbean/newbean.bat diff --git a/jonas/jonas/src/org/objectweb/jonas/newbean/newbean.sh b/jonas/src/org/objectweb/jonas/newbean/newbean.sh similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/newbean/newbean.sh rename to jonas/src/org/objectweb/jonas/newbean/newbean.sh diff --git a/jonas/jonas/src/org/objectweb/jonas/newbean/remote.vm b/jonas/src/org/objectweb/jonas/newbean/remote.vm similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/newbean/remote.vm rename to jonas/src/org/objectweb/jonas/newbean/remote.vm diff --git a/jonas/jonas/src/org/objectweb/jonas/registry/RegistryService.java b/jonas/src/org/objectweb/jonas/registry/RegistryService.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/registry/RegistryService.java rename to jonas/src/org/objectweb/jonas/registry/RegistryService.java diff --git a/jonas/jonas/src/org/objectweb/jonas/registry/RegistryServiceImpl.java b/jonas/src/org/objectweb/jonas/registry/RegistryServiceImpl.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/registry/RegistryServiceImpl.java rename to jonas/src/org/objectweb/jonas/registry/RegistryServiceImpl.java diff --git a/jonas/jonas/src/org/objectweb/jonas/resource/ArchiveConfigMBean.java b/jonas/src/org/objectweb/jonas/resource/ArchiveConfigMBean.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/resource/ArchiveConfigMBean.java rename to jonas/src/org/objectweb/jonas/resource/ArchiveConfigMBean.java diff --git a/jonas/jonas/src/org/objectweb/jonas/resource/ConnectionManagerImpl.java b/jonas/src/org/objectweb/jonas/resource/ConnectionManagerImpl.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/resource/ConnectionManagerImpl.java rename to jonas/src/org/objectweb/jonas/resource/ConnectionManagerImpl.java diff --git a/jonas/jonas/src/org/objectweb/jonas/resource/ConnectionManagerPoolParams.java b/jonas/src/org/objectweb/jonas/resource/ConnectionManagerPoolParams.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/resource/ConnectionManagerPoolParams.java rename to jonas/src/org/objectweb/jonas/resource/ConnectionManagerPoolParams.java diff --git a/jonas/jonas/src/org/objectweb/jonas/resource/JCAActivationSpec.java b/jonas/src/org/objectweb/jonas/resource/JCAActivationSpec.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/resource/JCAActivationSpec.java rename to jonas/src/org/objectweb/jonas/resource/JCAActivationSpec.java diff --git a/jonas/jonas/src/org/objectweb/jonas/resource/JCAAdminObject.java b/jonas/src/org/objectweb/jonas/resource/JCAAdminObject.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/resource/JCAAdminObject.java rename to jonas/src/org/objectweb/jonas/resource/JCAAdminObject.java diff --git a/jonas/jonas/src/org/objectweb/jonas/resource/JCAConnectionFactory.java b/jonas/src/org/objectweb/jonas/resource/JCAConnectionFactory.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/resource/JCAConnectionFactory.java rename to jonas/src/org/objectweb/jonas/resource/JCAConnectionFactory.java diff --git a/jonas/jonas/src/org/objectweb/jonas/resource/JCAConnectionFactoryMBean.java b/jonas/src/org/objectweb/jonas/resource/JCAConnectionFactoryMBean.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/resource/JCAConnectionFactoryMBean.java rename to jonas/src/org/objectweb/jonas/resource/JCAConnectionFactoryMBean.java diff --git a/jonas/jonas/src/org/objectweb/jonas/resource/JCAManagedConnectionFactory.java b/jonas/src/org/objectweb/jonas/resource/JCAManagedConnectionFactory.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/resource/JCAManagedConnectionFactory.java rename to jonas/src/org/objectweb/jonas/resource/JCAManagedConnectionFactory.java diff --git a/jonas/jonas/src/org/objectweb/jonas/resource/JCAResource.java b/jonas/src/org/objectweb/jonas/resource/JCAResource.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/resource/JCAResource.java rename to jonas/src/org/objectweb/jonas/resource/JCAResource.java diff --git a/jonas/jonas/src/org/objectweb/jonas/resource/JmxResourceAdapter.java b/jonas/src/org/objectweb/jonas/resource/JmxResourceAdapter.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/resource/JmxResourceAdapter.java rename to jonas/src/org/objectweb/jonas/resource/JmxResourceAdapter.java diff --git a/jonas/jonas/src/org/objectweb/jonas/resource/JmxResourceAdapterMBean.java b/jonas/src/org/objectweb/jonas/resource/JmxResourceAdapterMBean.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/resource/JmxResourceAdapterMBean.java rename to jonas/src/org/objectweb/jonas/resource/JmxResourceAdapterMBean.java diff --git a/jonas/jonas/src/org/objectweb/jonas/resource/JonasSQLWrapper.java b/jonas/src/org/objectweb/jonas/resource/JonasSQLWrapper.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/resource/JonasSQLWrapper.java rename to jonas/src/org/objectweb/jonas/resource/JonasSQLWrapper.java diff --git a/jonas/jonas/src/org/objectweb/jonas/resource/LocalXAWrapper.java b/jonas/src/org/objectweb/jonas/resource/LocalXAWrapper.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/resource/LocalXAWrapper.java rename to jonas/src/org/objectweb/jonas/resource/LocalXAWrapper.java diff --git a/jonas/jonas/src/org/objectweb/jonas/resource/MCInfo.java b/jonas/src/org/objectweb/jonas/resource/MCInfo.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/resource/MCInfo.java rename to jonas/src/org/objectweb/jonas/resource/MCInfo.java diff --git a/jonas/jonas/src/org/objectweb/jonas/resource/MySynchro.java b/jonas/src/org/objectweb/jonas/resource/MySynchro.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/resource/MySynchro.java rename to jonas/src/org/objectweb/jonas/resource/MySynchro.java diff --git a/jonas/jonas/src/org/objectweb/jonas/resource/PreparedStatementWrapper.java b/jonas/src/org/objectweb/jonas/resource/PreparedStatementWrapper.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/resource/PreparedStatementWrapper.java rename to jonas/src/org/objectweb/jonas/resource/PreparedStatementWrapper.java diff --git a/jonas/jonas/src/org/objectweb/jonas/resource/README b/jonas/src/org/objectweb/jonas/resource/README similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/resource/README rename to jonas/src/org/objectweb/jonas/resource/README diff --git a/jonas/jonas/src/org/objectweb/jonas/resource/RMEImpl.java b/jonas/src/org/objectweb/jonas/resource/RMEImpl.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/resource/RMEImpl.java rename to jonas/src/org/objectweb/jonas/resource/RMEImpl.java diff --git a/jonas/jonas/src/org/objectweb/jonas/resource/Rar.java b/jonas/src/org/objectweb/jonas/resource/Rar.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/resource/Rar.java rename to jonas/src/org/objectweb/jonas/resource/Rar.java diff --git a/jonas/jonas/src/org/objectweb/jonas/resource/RarConfigMBean.java b/jonas/src/org/objectweb/jonas/resource/RarConfigMBean.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/resource/RarConfigMBean.java rename to jonas/src/org/objectweb/jonas/resource/RarConfigMBean.java diff --git a/jonas/jonas/src/org/objectweb/jonas/resource/ResourceAdapter.java b/jonas/src/org/objectweb/jonas/resource/ResourceAdapter.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/resource/ResourceAdapter.java rename to jonas/src/org/objectweb/jonas/resource/ResourceAdapter.java diff --git a/jonas/jonas/src/org/objectweb/jonas/resource/ResourceAdapterModule.java b/jonas/src/org/objectweb/jonas/resource/ResourceAdapterModule.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/resource/ResourceAdapterModule.java rename to jonas/src/org/objectweb/jonas/resource/ResourceAdapterModule.java diff --git a/jonas/jonas/src/org/objectweb/jonas/resource/ResourceBootstrapContext.java b/jonas/src/org/objectweb/jonas/resource/ResourceBootstrapContext.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/resource/ResourceBootstrapContext.java rename to jonas/src/org/objectweb/jonas/resource/ResourceBootstrapContext.java diff --git a/jonas/jonas/src/org/objectweb/jonas/resource/ResourceObjectJNDIHandler.java b/jonas/src/org/objectweb/jonas/resource/ResourceObjectJNDIHandler.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/resource/ResourceObjectJNDIHandler.java rename to jonas/src/org/objectweb/jonas/resource/ResourceObjectJNDIHandler.java diff --git a/jonas/jonas/src/org/objectweb/jonas/resource/ResourceService.java b/jonas/src/org/objectweb/jonas/resource/ResourceService.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/resource/ResourceService.java rename to jonas/src/org/objectweb/jonas/resource/ResourceService.java diff --git a/jonas/jonas/src/org/objectweb/jonas/resource/ResourceServiceException.java b/jonas/src/org/objectweb/jonas/resource/ResourceServiceException.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/resource/ResourceServiceException.java rename to jonas/src/org/objectweb/jonas/resource/ResourceServiceException.java diff --git a/jonas/jonas/src/org/objectweb/jonas/resource/ResourceServiceImpl.java b/jonas/src/org/objectweb/jonas/resource/ResourceServiceImpl.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/resource/ResourceServiceImpl.java rename to jonas/src/org/objectweb/jonas/resource/ResourceServiceImpl.java diff --git a/jonas/jonas/src/org/objectweb/jonas/resource/ResourceServiceImplMBean.java b/jonas/src/org/objectweb/jonas/resource/ResourceServiceImplMBean.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/resource/ResourceServiceImplMBean.java rename to jonas/src/org/objectweb/jonas/resource/ResourceServiceImplMBean.java diff --git a/jonas/jonas/src/org/objectweb/jonas/resource/ResourceSpec.java b/jonas/src/org/objectweb/jonas/resource/ResourceSpec.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/resource/ResourceSpec.java rename to jonas/src/org/objectweb/jonas/resource/ResourceSpec.java diff --git a/jonas/jonas/src/org/objectweb/jonas/resource/ResourceUtility.java b/jonas/src/org/objectweb/jonas/resource/ResourceUtility.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/resource/ResourceUtility.java rename to jonas/src/org/objectweb/jonas/resource/ResourceUtility.java diff --git a/jonas/jonas/src/org/objectweb/jonas/resource/SQLManager.java b/jonas/src/org/objectweb/jonas/resource/SQLManager.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/resource/SQLManager.java rename to jonas/src/org/objectweb/jonas/resource/SQLManager.java diff --git a/jonas/jonas/src/org/objectweb/jonas/resource/mbeans-descriptors.xml b/jonas/src/org/objectweb/jonas/resource/mbeans-descriptors.xml similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/resource/mbeans-descriptors.xml rename to jonas/src/org/objectweb/jonas/resource/mbeans-descriptors.xml diff --git a/jonas/jonas/src/org/objectweb/jonas/resource/pool/api/Pool.java b/jonas/src/org/objectweb/jonas/resource/pool/api/Pool.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/resource/pool/api/Pool.java rename to jonas/src/org/objectweb/jonas/resource/pool/api/Pool.java diff --git a/jonas/jonas/src/org/objectweb/jonas/resource/pool/api/PoolItemStats.java b/jonas/src/org/objectweb/jonas/resource/pool/api/PoolItemStats.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/resource/pool/api/PoolItemStats.java rename to jonas/src/org/objectweb/jonas/resource/pool/api/PoolItemStats.java diff --git a/jonas/jonas/src/org/objectweb/jonas/resource/pool/api/PoolMatchFactory.java b/jonas/src/org/objectweb/jonas/resource/pool/api/PoolMatchFactory.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/resource/pool/api/PoolMatchFactory.java rename to jonas/src/org/objectweb/jonas/resource/pool/api/PoolMatchFactory.java diff --git a/jonas/jonas/src/org/objectweb/jonas/resource/pool/api/PoolProvider.java b/jonas/src/org/objectweb/jonas/resource/pool/api/PoolProvider.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/resource/pool/api/PoolProvider.java rename to jonas/src/org/objectweb/jonas/resource/pool/api/PoolProvider.java diff --git a/jonas/jonas/src/org/objectweb/jonas/resource/pool/api/PoolResource.java b/jonas/src/org/objectweb/jonas/resource/pool/api/PoolResource.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/resource/pool/api/PoolResource.java rename to jonas/src/org/objectweb/jonas/resource/pool/api/PoolResource.java diff --git a/jonas/jonas/src/org/objectweb/jonas/resource/pool/lib/HArrayPool.java b/jonas/src/org/objectweb/jonas/resource/pool/lib/HArrayPool.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/resource/pool/lib/HArrayPool.java rename to jonas/src/org/objectweb/jonas/resource/pool/lib/HArrayPool.java diff --git a/jonas/jonas/src/org/objectweb/jonas/resource/pool/lib/HArrayPoolMonitor.java b/jonas/src/org/objectweb/jonas/resource/pool/lib/HArrayPoolMonitor.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/resource/pool/lib/HArrayPoolMonitor.java rename to jonas/src/org/objectweb/jonas/resource/pool/lib/HArrayPoolMonitor.java diff --git a/jonas/jonas/src/org/objectweb/jonas/security/AbsSecurityContextHelper.java b/jonas/src/org/objectweb/jonas/security/AbsSecurityContextHelper.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/security/AbsSecurityContextHelper.java rename to jonas/src/org/objectweb/jonas/security/AbsSecurityContextHelper.java diff --git a/jonas/jonas/src/org/objectweb/jonas/security/JResources.java b/jonas/src/org/objectweb/jonas/security/JResources.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/security/JResources.java rename to jonas/src/org/objectweb/jonas/security/JResources.java diff --git a/jonas/jonas/src/org/objectweb/jonas/security/JonasSecurityServiceImpl.java b/jonas/src/org/objectweb/jonas/security/JonasSecurityServiceImpl.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/security/JonasSecurityServiceImpl.java rename to jonas/src/org/objectweb/jonas/security/JonasSecurityServiceImpl.java diff --git a/jonas/jonas/src/org/objectweb/jonas/security/JonasSecurityServiceImplMBean.java b/jonas/src/org/objectweb/jonas/security/JonasSecurityServiceImplMBean.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/security/JonasSecurityServiceImplMBean.java rename to jonas/src/org/objectweb/jonas/security/JonasSecurityServiceImplMBean.java diff --git a/jonas/jonas/src/org/objectweb/jonas/security/PolicyProvider.java b/jonas/src/org/objectweb/jonas/security/PolicyProvider.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/security/PolicyProvider.java rename to jonas/src/org/objectweb/jonas/security/PolicyProvider.java diff --git a/jonas/jonas/src/org/objectweb/jonas/security/SecurityService.java b/jonas/src/org/objectweb/jonas/security/SecurityService.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/security/SecurityService.java rename to jonas/src/org/objectweb/jonas/security/SecurityService.java diff --git a/jonas/jonas/src/org/objectweb/jonas/security/SecurityServiceException.java b/jonas/src/org/objectweb/jonas/security/SecurityServiceException.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/security/SecurityServiceException.java rename to jonas/src/org/objectweb/jonas/security/SecurityServiceException.java diff --git a/jonas/jonas/src/org/objectweb/jonas/security/auth/JGroup.java b/jonas/src/org/objectweb/jonas/security/auth/JGroup.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/security/auth/JGroup.java rename to jonas/src/org/objectweb/jonas/security/auth/JGroup.java diff --git a/jonas/jonas/src/org/objectweb/jonas/security/auth/JPrincipal.java b/jonas/src/org/objectweb/jonas/security/auth/JPrincipal.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/security/auth/JPrincipal.java rename to jonas/src/org/objectweb/jonas/security/auth/JPrincipal.java diff --git a/jonas/jonas/src/org/objectweb/jonas/security/auth/JRole.java b/jonas/src/org/objectweb/jonas/security/auth/JRole.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/security/auth/JRole.java rename to jonas/src/org/objectweb/jonas/security/auth/JRole.java diff --git a/jonas/jonas/src/org/objectweb/jonas/security/auth/JSigned.java b/jonas/src/org/objectweb/jonas/security/auth/JSigned.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/security/auth/JSigned.java rename to jonas/src/org/objectweb/jonas/security/auth/JSigned.java diff --git a/jonas/jonas/src/org/objectweb/jonas/security/auth/JSubject.java b/jonas/src/org/objectweb/jonas/security/auth/JSubject.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/security/auth/JSubject.java rename to jonas/src/org/objectweb/jonas/security/auth/JSubject.java diff --git a/jonas/jonas/src/org/objectweb/jonas/security/auth/callback/CertificateCallback.java b/jonas/src/org/objectweb/jonas/security/auth/callback/CertificateCallback.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/security/auth/callback/CertificateCallback.java rename to jonas/src/org/objectweb/jonas/security/auth/callback/CertificateCallback.java diff --git a/jonas/jonas/src/org/objectweb/jonas/security/auth/callback/DialogCallbackHandler.java b/jonas/src/org/objectweb/jonas/security/auth/callback/DialogCallbackHandler.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/security/auth/callback/DialogCallbackHandler.java rename to jonas/src/org/objectweb/jonas/security/auth/callback/DialogCallbackHandler.java diff --git a/jonas/jonas/src/org/objectweb/jonas/security/auth/callback/LoginCallbackHandler.java b/jonas/src/org/objectweb/jonas/security/auth/callback/LoginCallbackHandler.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/security/auth/callback/LoginCallbackHandler.java rename to jonas/src/org/objectweb/jonas/security/auth/callback/LoginCallbackHandler.java diff --git a/jonas/jonas/src/org/objectweb/jonas/security/auth/callback/NoInputCallbackHandler.java b/jonas/src/org/objectweb/jonas/security/auth/callback/NoInputCallbackHandler.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/security/auth/callback/NoInputCallbackHandler.java rename to jonas/src/org/objectweb/jonas/security/auth/callback/NoInputCallbackHandler.java diff --git a/jonas/jonas/src/org/objectweb/jonas/security/auth/spi/CRLLoginModule.java b/jonas/src/org/objectweb/jonas/security/auth/spi/CRLLoginModule.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/security/auth/spi/CRLLoginModule.java rename to jonas/src/org/objectweb/jonas/security/auth/spi/CRLLoginModule.java diff --git a/jonas/jonas/src/org/objectweb/jonas/security/auth/spi/ClientLoginModule.java b/jonas/src/org/objectweb/jonas/security/auth/spi/ClientLoginModule.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/security/auth/spi/ClientLoginModule.java rename to jonas/src/org/objectweb/jonas/security/auth/spi/ClientLoginModule.java diff --git a/jonas/jonas/src/org/objectweb/jonas/security/auth/spi/JDirectResourceLoginModule.java b/jonas/src/org/objectweb/jonas/security/auth/spi/JDirectResourceLoginModule.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/security/auth/spi/JDirectResourceLoginModule.java rename to jonas/src/org/objectweb/jonas/security/auth/spi/JDirectResourceLoginModule.java diff --git a/jonas/jonas/src/org/objectweb/jonas/security/auth/spi/JResourceLoginModule.java b/jonas/src/org/objectweb/jonas/security/auth/spi/JResourceLoginModule.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/security/auth/spi/JResourceLoginModule.java rename to jonas/src/org/objectweb/jonas/security/auth/spi/JResourceLoginModule.java diff --git a/jonas/jonas/src/org/objectweb/jonas/security/auth/spi/RemoteLoginModule.java b/jonas/src/org/objectweb/jonas/security/auth/spi/RemoteLoginModule.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/security/auth/spi/RemoteLoginModule.java rename to jonas/src/org/objectweb/jonas/security/auth/spi/RemoteLoginModule.java diff --git a/jonas/jonas/src/org/objectweb/jonas/security/auth/spi/SignLoginModule.java b/jonas/src/org/objectweb/jonas/security/auth/spi/SignLoginModule.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/security/auth/spi/SignLoginModule.java rename to jonas/src/org/objectweb/jonas/security/auth/spi/SignLoginModule.java diff --git a/jonas/jonas/src/org/objectweb/jonas/security/iiop/Csiv2ClientInterceptor.java b/jonas/src/org/objectweb/jonas/security/iiop/Csiv2ClientInterceptor.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/security/iiop/Csiv2ClientInterceptor.java rename to jonas/src/org/objectweb/jonas/security/iiop/Csiv2ClientInterceptor.java diff --git a/jonas/jonas/src/org/objectweb/jonas/security/iiop/Csiv2Const.java b/jonas/src/org/objectweb/jonas/security/iiop/Csiv2Const.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/security/iiop/Csiv2Const.java rename to jonas/src/org/objectweb/jonas/security/iiop/Csiv2Const.java diff --git a/jonas/jonas/src/org/objectweb/jonas/security/iiop/Csiv2Initializer.java b/jonas/src/org/objectweb/jonas/security/iiop/Csiv2Initializer.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/security/iiop/Csiv2Initializer.java rename to jonas/src/org/objectweb/jonas/security/iiop/Csiv2Initializer.java diff --git a/jonas/jonas/src/org/objectweb/jonas/security/iiop/Csiv2InterceptorException.java b/jonas/src/org/objectweb/jonas/security/iiop/Csiv2InterceptorException.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/security/iiop/Csiv2InterceptorException.java rename to jonas/src/org/objectweb/jonas/security/iiop/Csiv2InterceptorException.java diff --git a/jonas/jonas/src/org/objectweb/jonas/security/iiop/Csiv2IorInterceptor.java b/jonas/src/org/objectweb/jonas/security/iiop/Csiv2IorInterceptor.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/security/iiop/Csiv2IorInterceptor.java rename to jonas/src/org/objectweb/jonas/security/iiop/Csiv2IorInterceptor.java diff --git a/jonas/jonas/src/org/objectweb/jonas/security/iiop/Csiv2ServerInterceptor.java b/jonas/src/org/objectweb/jonas/security/iiop/Csiv2ServerInterceptor.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/security/iiop/Csiv2ServerInterceptor.java rename to jonas/src/org/objectweb/jonas/security/iiop/Csiv2ServerInterceptor.java diff --git a/jonas/jonas/src/org/objectweb/jonas/security/iiop/ORBHelper.java b/jonas/src/org/objectweb/jonas/security/iiop/ORBHelper.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/security/iiop/ORBHelper.java rename to jonas/src/org/objectweb/jonas/security/iiop/ORBHelper.java diff --git a/jonas/jonas/src/org/objectweb/jonas/security/iiop/SecurityContextHelper.java b/jonas/src/org/objectweb/jonas/security/iiop/SecurityContextHelper.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/security/iiop/SecurityContextHelper.java rename to jonas/src/org/objectweb/jonas/security/iiop/SecurityContextHelper.java diff --git a/jonas/jonas/src/org/objectweb/jonas/security/interceptors/iiop/CorbaClientSecurityInterceptor.java b/jonas/src/org/objectweb/jonas/security/interceptors/iiop/CorbaClientSecurityInterceptor.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/security/interceptors/iiop/CorbaClientSecurityInterceptor.java rename to jonas/src/org/objectweb/jonas/security/interceptors/iiop/CorbaClientSecurityInterceptor.java diff --git a/jonas/jonas/src/org/objectweb/jonas/security/interceptors/iiop/CorbaServerSecurityInterceptor.java b/jonas/src/org/objectweb/jonas/security/interceptors/iiop/CorbaServerSecurityInterceptor.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/security/interceptors/iiop/CorbaServerSecurityInterceptor.java rename to jonas/src/org/objectweb/jonas/security/interceptors/iiop/CorbaServerSecurityInterceptor.java diff --git a/jonas/jonas/src/org/objectweb/jonas/security/interceptors/iiop/SecurityInitializer.java b/jonas/src/org/objectweb/jonas/security/interceptors/iiop/SecurityInitializer.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/security/interceptors/iiop/SecurityInitializer.java rename to jonas/src/org/objectweb/jonas/security/interceptors/iiop/SecurityInitializer.java diff --git a/jonas/jonas/src/org/objectweb/jonas/security/interceptors/iiop/SecurityInterceptor.java b/jonas/src/org/objectweb/jonas/security/interceptors/iiop/SecurityInterceptor.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/security/interceptors/iiop/SecurityInterceptor.java rename to jonas/src/org/objectweb/jonas/security/interceptors/iiop/SecurityInterceptor.java diff --git a/jonas/jonas/src/org/objectweb/jonas/security/interceptors/jeremie/JonasSecurityReceiver.java b/jonas/src/org/objectweb/jonas/security/interceptors/jeremie/JonasSecurityReceiver.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/security/interceptors/jeremie/JonasSecurityReceiver.java rename to jonas/src/org/objectweb/jonas/security/interceptors/jeremie/JonasSecurityReceiver.java diff --git a/jonas/jonas/src/org/objectweb/jonas/security/interceptors/jeremie/JonasSecuritySender.java b/jonas/src/org/objectweb/jonas/security/interceptors/jeremie/JonasSecuritySender.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/security/interceptors/jeremie/JonasSecuritySender.java rename to jonas/src/org/objectweb/jonas/security/interceptors/jeremie/JonasSecuritySender.java diff --git a/jonas/jonas/src/org/objectweb/jonas/security/interceptors/jrmp/ClientSecurityInterceptor.java b/jonas/src/org/objectweb/jonas/security/interceptors/jrmp/ClientSecurityInterceptor.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/security/interceptors/jrmp/ClientSecurityInterceptor.java rename to jonas/src/org/objectweb/jonas/security/interceptors/jrmp/ClientSecurityInterceptor.java diff --git a/jonas/jonas/src/org/objectweb/jonas/security/interceptors/jrmp/SecurityInitializer.java b/jonas/src/org/objectweb/jonas/security/interceptors/jrmp/SecurityInitializer.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/security/interceptors/jrmp/SecurityInitializer.java rename to jonas/src/org/objectweb/jonas/security/interceptors/jrmp/SecurityInitializer.java diff --git a/jonas/jonas/src/org/objectweb/jonas/security/interceptors/jrmp/SecurityServiceContext.java b/jonas/src/org/objectweb/jonas/security/interceptors/jrmp/SecurityServiceContext.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/security/interceptors/jrmp/SecurityServiceContext.java rename to jonas/src/org/objectweb/jonas/security/interceptors/jrmp/SecurityServiceContext.java diff --git a/jonas/jonas/src/org/objectweb/jonas/security/interceptors/jrmp/ServerSecurityInterceptor.java b/jonas/src/org/objectweb/jonas/security/interceptors/jrmp/ServerSecurityInterceptor.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/security/interceptors/jrmp/ServerSecurityInterceptor.java rename to jonas/src/org/objectweb/jonas/security/interceptors/jrmp/ServerSecurityInterceptor.java diff --git a/jonas/jonas/src/org/objectweb/jonas/security/interceptors/jrmp/ctxcheck/CtxCheckConfig.java b/jonas/src/org/objectweb/jonas/security/interceptors/jrmp/ctxcheck/CtxCheckConfig.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/security/interceptors/jrmp/ctxcheck/CtxCheckConfig.java rename to jonas/src/org/objectweb/jonas/security/interceptors/jrmp/ctxcheck/CtxCheckConfig.java diff --git a/jonas/jonas/src/org/objectweb/jonas/security/interceptors/jrmp/ctxcheck/Initializer.java b/jonas/src/org/objectweb/jonas/security/interceptors/jrmp/ctxcheck/Initializer.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/security/interceptors/jrmp/ctxcheck/Initializer.java rename to jonas/src/org/objectweb/jonas/security/interceptors/jrmp/ctxcheck/Initializer.java diff --git a/jonas/jonas/src/org/objectweb/jonas/security/interceptors/jrmp/ctxcheck/ServerInterceptor.java b/jonas/src/org/objectweb/jonas/security/interceptors/jrmp/ctxcheck/ServerInterceptor.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/security/interceptors/jrmp/ctxcheck/ServerInterceptor.java rename to jonas/src/org/objectweb/jonas/security/interceptors/jrmp/ctxcheck/ServerInterceptor.java diff --git a/jonas/jonas/src/org/objectweb/jonas/security/jacc/JPolicyContextHandler.java b/jonas/src/org/objectweb/jonas/security/jacc/JPolicyContextHandler.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/security/jacc/JPolicyContextHandler.java rename to jonas/src/org/objectweb/jonas/security/jacc/JPolicyContextHandler.java diff --git a/jonas/jonas/src/org/objectweb/jonas/security/jacc/JPolicyContextHandlerCurrent.java b/jonas/src/org/objectweb/jonas/security/jacc/JPolicyContextHandlerCurrent.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/security/jacc/JPolicyContextHandlerCurrent.java rename to jonas/src/org/objectweb/jonas/security/jacc/JPolicyContextHandlerCurrent.java diff --git a/jonas/jonas/src/org/objectweb/jonas/security/jacc/JPolicyContextHandlerData.java b/jonas/src/org/objectweb/jonas/security/jacc/JPolicyContextHandlerData.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/security/jacc/JPolicyContextHandlerData.java rename to jonas/src/org/objectweb/jonas/security/jacc/JPolicyContextHandlerData.java diff --git a/jonas/jonas/src/org/objectweb/jonas/security/jacc/JPolicyUserRoleMapping.java b/jonas/src/org/objectweb/jonas/security/jacc/JPolicyUserRoleMapping.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/security/jacc/JPolicyUserRoleMapping.java rename to jonas/src/org/objectweb/jonas/security/jacc/JPolicyUserRoleMapping.java diff --git a/jonas/jonas/src/org/objectweb/jonas/security/lib/JErrorHandler.java b/jonas/src/org/objectweb/jonas/security/lib/JErrorHandler.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/security/lib/JErrorHandler.java rename to jonas/src/org/objectweb/jonas/security/lib/JErrorHandler.java diff --git a/jonas/jonas/src/org/objectweb/jonas/security/lib/JResourceManager.java b/jonas/src/org/objectweb/jonas/security/lib/JResourceManager.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/security/lib/JResourceManager.java rename to jonas/src/org/objectweb/jonas/security/lib/JResourceManager.java diff --git a/jonas/jonas/src/org/objectweb/jonas/security/lib/wrapper/JResourceManagerWrapper.java b/jonas/src/org/objectweb/jonas/security/lib/wrapper/JResourceManagerWrapper.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/security/lib/wrapper/JResourceManagerWrapper.java rename to jonas/src/org/objectweb/jonas/security/lib/wrapper/JResourceManagerWrapper.java diff --git a/jonas/jonas/src/org/objectweb/jonas/security/realm/dtd/jonas-realm_1_0.dtd b/jonas/src/org/objectweb/jonas/security/realm/dtd/jonas-realm_1_0.dtd similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/security/realm/dtd/jonas-realm_1_0.dtd rename to jonas/src/org/objectweb/jonas/security/realm/dtd/jonas-realm_1_0.dtd diff --git a/jonas/jonas/src/org/objectweb/jonas/security/realm/factory/JResource.java b/jonas/src/org/objectweb/jonas/security/realm/factory/JResource.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/security/realm/factory/JResource.java rename to jonas/src/org/objectweb/jonas/security/realm/factory/JResource.java diff --git a/jonas/jonas/src/org/objectweb/jonas/security/realm/factory/JResourceDS.java b/jonas/src/org/objectweb/jonas/security/realm/factory/JResourceDS.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/security/realm/factory/JResourceDS.java rename to jonas/src/org/objectweb/jonas/security/realm/factory/JResourceDS.java diff --git a/jonas/jonas/src/org/objectweb/jonas/security/realm/factory/JResourceDSFactory.java b/jonas/src/org/objectweb/jonas/security/realm/factory/JResourceDSFactory.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/security/realm/factory/JResourceDSFactory.java rename to jonas/src/org/objectweb/jonas/security/realm/factory/JResourceDSFactory.java diff --git a/jonas/jonas/src/org/objectweb/jonas/security/realm/factory/JResourceDSMBean.java b/jonas/src/org/objectweb/jonas/security/realm/factory/JResourceDSMBean.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/security/realm/factory/JResourceDSMBean.java rename to jonas/src/org/objectweb/jonas/security/realm/factory/JResourceDSMBean.java diff --git a/jonas/jonas/src/org/objectweb/jonas/security/realm/factory/JResourceException.java b/jonas/src/org/objectweb/jonas/security/realm/factory/JResourceException.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/security/realm/factory/JResourceException.java rename to jonas/src/org/objectweb/jonas/security/realm/factory/JResourceException.java diff --git a/jonas/jonas/src/org/objectweb/jonas/security/realm/factory/JResourceFactory.java b/jonas/src/org/objectweb/jonas/security/realm/factory/JResourceFactory.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/security/realm/factory/JResourceFactory.java rename to jonas/src/org/objectweb/jonas/security/realm/factory/JResourceFactory.java diff --git a/jonas/jonas/src/org/objectweb/jonas/security/realm/factory/JResourceLDAP.java b/jonas/src/org/objectweb/jonas/security/realm/factory/JResourceLDAP.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/security/realm/factory/JResourceLDAP.java rename to jonas/src/org/objectweb/jonas/security/realm/factory/JResourceLDAP.java diff --git a/jonas/jonas/src/org/objectweb/jonas/security/realm/factory/JResourceLDAPFactory.java b/jonas/src/org/objectweb/jonas/security/realm/factory/JResourceLDAPFactory.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/security/realm/factory/JResourceLDAPFactory.java rename to jonas/src/org/objectweb/jonas/security/realm/factory/JResourceLDAPFactory.java diff --git a/jonas/jonas/src/org/objectweb/jonas/security/realm/factory/JResourceLDAPMBean.java b/jonas/src/org/objectweb/jonas/security/realm/factory/JResourceLDAPMBean.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/security/realm/factory/JResourceLDAPMBean.java rename to jonas/src/org/objectweb/jonas/security/realm/factory/JResourceLDAPMBean.java diff --git a/jonas/jonas/src/org/objectweb/jonas/security/realm/factory/JResourceMBean.java b/jonas/src/org/objectweb/jonas/security/realm/factory/JResourceMBean.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/security/realm/factory/JResourceMBean.java rename to jonas/src/org/objectweb/jonas/security/realm/factory/JResourceMBean.java diff --git a/jonas/jonas/src/org/objectweb/jonas/security/realm/factory/JResourceMemory.java b/jonas/src/org/objectweb/jonas/security/realm/factory/JResourceMemory.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/security/realm/factory/JResourceMemory.java rename to jonas/src/org/objectweb/jonas/security/realm/factory/JResourceMemory.java diff --git a/jonas/jonas/src/org/objectweb/jonas/security/realm/factory/JResourceMemoryFactory.java b/jonas/src/org/objectweb/jonas/security/realm/factory/JResourceMemoryFactory.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/security/realm/factory/JResourceMemoryFactory.java rename to jonas/src/org/objectweb/jonas/security/realm/factory/JResourceMemoryFactory.java diff --git a/jonas/jonas/src/org/objectweb/jonas/security/realm/factory/JResourceMemoryMBean.java b/jonas/src/org/objectweb/jonas/security/realm/factory/JResourceMemoryMBean.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/security/realm/factory/JResourceMemoryMBean.java rename to jonas/src/org/objectweb/jonas/security/realm/factory/JResourceMemoryMBean.java diff --git a/jonas/jonas/src/org/objectweb/jonas/security/realm/factory/JResourceRemote.java b/jonas/src/org/objectweb/jonas/security/realm/factory/JResourceRemote.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/security/realm/factory/JResourceRemote.java rename to jonas/src/org/objectweb/jonas/security/realm/factory/JResourceRemote.java diff --git a/jonas/jonas/src/org/objectweb/jonas/security/realm/factory/JResourceRemoteImpl.java b/jonas/src/org/objectweb/jonas/security/realm/factory/JResourceRemoteImpl.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/security/realm/factory/JResourceRemoteImpl.java rename to jonas/src/org/objectweb/jonas/security/realm/factory/JResourceRemoteImpl.java diff --git a/jonas/jonas/src/org/objectweb/jonas/security/realm/lib/Base64.java b/jonas/src/org/objectweb/jonas/security/realm/lib/Base64.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/security/realm/lib/Base64.java rename to jonas/src/org/objectweb/jonas/security/realm/lib/Base64.java diff --git a/jonas/jonas/src/org/objectweb/jonas/security/realm/lib/HashHelper.java b/jonas/src/org/objectweb/jonas/security/realm/lib/HashHelper.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/security/realm/lib/HashHelper.java rename to jonas/src/org/objectweb/jonas/security/realm/lib/HashHelper.java diff --git a/jonas/jonas/src/org/objectweb/jonas/security/realm/lib/HashPassword.java b/jonas/src/org/objectweb/jonas/security/realm/lib/HashPassword.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/security/realm/lib/HashPassword.java rename to jonas/src/org/objectweb/jonas/security/realm/lib/HashPassword.java diff --git a/jonas/jonas/src/org/objectweb/jonas/security/realm/lib/XML.java b/jonas/src/org/objectweb/jonas/security/realm/lib/XML.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/security/realm/lib/XML.java rename to jonas/src/org/objectweb/jonas/security/realm/lib/XML.java diff --git a/jonas/jonas/src/org/objectweb/jonas/security/realm/principals/Group.java b/jonas/src/org/objectweb/jonas/security/realm/principals/Group.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/security/realm/principals/Group.java rename to jonas/src/org/objectweb/jonas/security/realm/principals/Group.java diff --git a/jonas/jonas/src/org/objectweb/jonas/security/realm/principals/GroupMBean.java b/jonas/src/org/objectweb/jonas/security/realm/principals/GroupMBean.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/security/realm/principals/GroupMBean.java rename to jonas/src/org/objectweb/jonas/security/realm/principals/GroupMBean.java diff --git a/jonas/jonas/src/org/objectweb/jonas/security/realm/principals/LDAPUser.java b/jonas/src/org/objectweb/jonas/security/realm/principals/LDAPUser.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/security/realm/principals/LDAPUser.java rename to jonas/src/org/objectweb/jonas/security/realm/principals/LDAPUser.java diff --git a/jonas/jonas/src/org/objectweb/jonas/security/realm/principals/Role.java b/jonas/src/org/objectweb/jonas/security/realm/principals/Role.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/security/realm/principals/Role.java rename to jonas/src/org/objectweb/jonas/security/realm/principals/Role.java diff --git a/jonas/jonas/src/org/objectweb/jonas/security/realm/principals/RoleMBean.java b/jonas/src/org/objectweb/jonas/security/realm/principals/RoleMBean.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/security/realm/principals/RoleMBean.java rename to jonas/src/org/objectweb/jonas/security/realm/principals/RoleMBean.java diff --git a/jonas/jonas/src/org/objectweb/jonas/security/realm/principals/User.java b/jonas/src/org/objectweb/jonas/security/realm/principals/User.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/security/realm/principals/User.java rename to jonas/src/org/objectweb/jonas/security/realm/principals/User.java diff --git a/jonas/jonas/src/org/objectweb/jonas/security/realm/principals/UserMBean.java b/jonas/src/org/objectweb/jonas/security/realm/principals/UserMBean.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/security/realm/principals/UserMBean.java rename to jonas/src/org/objectweb/jonas/security/realm/principals/UserMBean.java diff --git a/jonas/jonas/src/org/objectweb/jonas/security/realm/web/catalina55/JAAS.java b/jonas/src/org/objectweb/jonas/security/realm/web/catalina55/JAAS.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/security/realm/web/catalina55/JAAS.java rename to jonas/src/org/objectweb/jonas/security/realm/web/catalina55/JAAS.java diff --git a/jonas/jonas/src/org/objectweb/jonas/security/realm/web/catalina55/JACC.java b/jonas/src/org/objectweb/jonas/security/realm/web/catalina55/JACC.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/security/realm/web/catalina55/JACC.java rename to jonas/src/org/objectweb/jonas/security/realm/web/catalina55/JACC.java diff --git a/jonas/jonas/src/org/objectweb/jonas/security/realm/web/catalina55/JFormAuthenticator.java b/jonas/src/org/objectweb/jonas/security/realm/web/catalina55/JFormAuthenticator.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/security/realm/web/catalina55/JFormAuthenticator.java rename to jonas/src/org/objectweb/jonas/security/realm/web/catalina55/JFormAuthenticator.java diff --git a/jonas/jonas/src/org/objectweb/jonas/security/realm/web/catalina55/Standard.java b/jonas/src/org/objectweb/jonas/security/realm/web/catalina55/Standard.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/security/realm/web/catalina55/Standard.java rename to jonas/src/org/objectweb/jonas/security/realm/web/catalina55/Standard.java diff --git a/jonas/jonas/src/org/objectweb/jonas/security/realm/web/jetty50/JAAS.java b/jonas/src/org/objectweb/jonas/security/realm/web/jetty50/JAAS.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/security/realm/web/jetty50/JAAS.java rename to jonas/src/org/objectweb/jonas/security/realm/web/jetty50/JAAS.java diff --git a/jonas/jonas/src/org/objectweb/jonas/security/realm/web/jetty50/JettyPrincipal.java b/jonas/src/org/objectweb/jonas/security/realm/web/jetty50/JettyPrincipal.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/security/realm/web/jetty50/JettyPrincipal.java rename to jonas/src/org/objectweb/jonas/security/realm/web/jetty50/JettyPrincipal.java diff --git a/jonas/jonas/src/org/objectweb/jonas/security/realm/web/jetty50/Standard.java b/jonas/src/org/objectweb/jonas/security/realm/web/jetty50/Standard.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/security/realm/web/jetty50/Standard.java rename to jonas/src/org/objectweb/jonas/security/realm/web/jetty50/Standard.java diff --git a/jonas/jonas/src/org/objectweb/jonas/security/rules/JDSRuleSet.java b/jonas/src/org/objectweb/jonas/security/rules/JDSRuleSet.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/security/rules/JDSRuleSet.java rename to jonas/src/org/objectweb/jonas/security/rules/JDSRuleSet.java diff --git a/jonas/jonas/src/org/objectweb/jonas/security/rules/JLDAPRuleSet.java b/jonas/src/org/objectweb/jonas/security/rules/JLDAPRuleSet.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/security/rules/JLDAPRuleSet.java rename to jonas/src/org/objectweb/jonas/security/rules/JLDAPRuleSet.java diff --git a/jonas/jonas/src/org/objectweb/jonas/security/rules/JMemoryRuleSet.java b/jonas/src/org/objectweb/jonas/security/rules/JMemoryRuleSet.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/security/rules/JMemoryRuleSet.java rename to jonas/src/org/objectweb/jonas/security/rules/JMemoryRuleSet.java diff --git a/jonas/jonas/src/org/objectweb/jonas/security/ws/SecurityContextHelper.java b/jonas/src/org/objectweb/jonas/security/ws/SecurityContextHelper.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/security/ws/SecurityContextHelper.java rename to jonas/src/org/objectweb/jonas/security/ws/SecurityContextHelper.java diff --git a/jonas/jonas/src/org/objectweb/jonas/server/Bootstrap.java b/jonas/src/org/objectweb/jonas/server/Bootstrap.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/server/Bootstrap.java rename to jonas/src/org/objectweb/jonas/server/Bootstrap.java diff --git a/jonas/jonas/src/org/objectweb/jonas/server/I18n.properties b/jonas/src/org/objectweb/jonas/server/I18n.properties similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/server/I18n.properties rename to jonas/src/org/objectweb/jonas/server/I18n.properties diff --git a/jonas/jonas/src/org/objectweb/jonas/server/I18n_es.properties b/jonas/src/org/objectweb/jonas/server/I18n_es.properties similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/server/I18n_es.properties rename to jonas/src/org/objectweb/jonas/server/I18n_es.properties diff --git a/jonas/jonas/src/org/objectweb/jonas/server/I18n_fr.properties b/jonas/src/org/objectweb/jonas/server/I18n_fr.properties similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/server/I18n_fr.properties rename to jonas/src/org/objectweb/jonas/server/I18n_fr.properties diff --git a/jonas/jonas/src/org/objectweb/jonas/server/J2EEServer.java b/jonas/src/org/objectweb/jonas/server/J2EEServer.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/server/J2EEServer.java rename to jonas/src/org/objectweb/jonas/server/J2EEServer.java diff --git a/jonas/jonas/src/org/objectweb/jonas/server/J2EEServerMBean.java b/jonas/src/org/objectweb/jonas/server/J2EEServerMBean.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/server/J2EEServerMBean.java rename to jonas/src/org/objectweb/jonas/server/J2EEServerMBean.java diff --git a/jonas/jonas/src/org/objectweb/jonas/server/JClassLoader.java b/jonas/src/org/objectweb/jonas/server/JClassLoader.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/server/JClassLoader.java rename to jonas/src/org/objectweb/jonas/server/JClassLoader.java diff --git a/jonas/jonas/src/org/objectweb/jonas/server/JFileFilter.java b/jonas/src/org/objectweb/jonas/server/JFileFilter.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/server/JFileFilter.java rename to jonas/src/org/objectweb/jonas/server/JFileFilter.java diff --git a/jonas/jonas/src/org/objectweb/jonas/server/JURLs.java b/jonas/src/org/objectweb/jonas/server/JURLs.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/server/JURLs.java rename to jonas/src/org/objectweb/jonas/server/JURLs.java diff --git a/jonas/jonas/src/org/objectweb/jonas/server/JavaVm.java b/jonas/src/org/objectweb/jonas/server/JavaVm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/server/JavaVm.java rename to jonas/src/org/objectweb/jonas/server/JavaVm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/server/LoaderManager.java b/jonas/src/org/objectweb/jonas/server/LoaderManager.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/server/LoaderManager.java rename to jonas/src/org/objectweb/jonas/server/LoaderManager.java diff --git a/jonas/jonas/src/org/objectweb/jonas/server/RemoteClassLoaderSpi.java b/jonas/src/org/objectweb/jonas/server/RemoteClassLoaderSpi.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/server/RemoteClassLoaderSpi.java rename to jonas/src/org/objectweb/jonas/server/RemoteClassLoaderSpi.java diff --git a/jonas/jonas/src/org/objectweb/jonas/server/Server.java b/jonas/src/org/objectweb/jonas/server/Server.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/server/Server.java rename to jonas/src/org/objectweb/jonas/server/Server.java diff --git a/jonas/jonas/src/org/objectweb/jonas/server/WorkManagerMBean.java b/jonas/src/org/objectweb/jonas/server/WorkManagerMBean.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/server/WorkManagerMBean.java rename to jonas/src/org/objectweb/jonas/server/WorkManagerMBean.java diff --git a/jonas/jonas/src/org/objectweb/jonas/server/mbeans-descriptors.xml b/jonas/src/org/objectweb/jonas/server/mbeans-descriptors.xml similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/server/mbeans-descriptors.xml rename to jonas/src/org/objectweb/jonas/server/mbeans-descriptors.xml diff --git a/jonas/jonas/src/org/objectweb/jonas/service/AbsDynamicServiceImpl.java b/jonas/src/org/objectweb/jonas/service/AbsDynamicServiceImpl.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/service/AbsDynamicServiceImpl.java rename to jonas/src/org/objectweb/jonas/service/AbsDynamicServiceImpl.java diff --git a/jonas/jonas/src/org/objectweb/jonas/service/AbsServiceImpl.java b/jonas/src/org/objectweb/jonas/service/AbsServiceImpl.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/service/AbsServiceImpl.java rename to jonas/src/org/objectweb/jonas/service/AbsServiceImpl.java diff --git a/jonas/jonas/src/org/objectweb/jonas/service/JonasAlreadyStartedException.java b/jonas/src/org/objectweb/jonas/service/JonasAlreadyStartedException.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/service/JonasAlreadyStartedException.java rename to jonas/src/org/objectweb/jonas/service/JonasAlreadyStartedException.java diff --git a/jonas/jonas/src/org/objectweb/jonas/service/Service.java b/jonas/src/org/objectweb/jonas/service/Service.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/service/Service.java rename to jonas/src/org/objectweb/jonas/service/Service.java diff --git a/jonas/jonas/src/org/objectweb/jonas/service/ServiceException.java b/jonas/src/org/objectweb/jonas/service/ServiceException.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/service/ServiceException.java rename to jonas/src/org/objectweb/jonas/service/ServiceException.java diff --git a/jonas/jonas/src/org/objectweb/jonas/service/ServiceManager.java b/jonas/src/org/objectweb/jonas/service/ServiceManager.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/service/ServiceManager.java rename to jonas/src/org/objectweb/jonas/service/ServiceManager.java diff --git a/jonas/jonas/src/org/objectweb/jonas/tools/CheckEnv.java b/jonas/src/org/objectweb/jonas/tools/CheckEnv.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/tools/CheckEnv.java rename to jonas/src/org/objectweb/jonas/tools/CheckEnv.java diff --git a/jonas/jonas/src/org/objectweb/jonas/tools/GenerateWrapperConf.java b/jonas/src/org/objectweb/jonas/tools/GenerateWrapperConf.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/tools/GenerateWrapperConf.java rename to jonas/src/org/objectweb/jonas/tools/GenerateWrapperConf.java diff --git a/jonas/jonas/src/org/objectweb/jonas/tools/migration/jboss/Migrate.java b/jonas/src/org/objectweb/jonas/tools/migration/jboss/Migrate.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/tools/migration/jboss/Migrate.java rename to jonas/src/org/objectweb/jonas/tools/migration/jboss/Migrate.java diff --git a/jonas/jonas/src/org/objectweb/jonas/tools/migration/jboss/Transformer.java b/jonas/src/org/objectweb/jonas/tools/migration/jboss/Transformer.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/tools/migration/jboss/Transformer.java rename to jonas/src/org/objectweb/jonas/tools/migration/jboss/Transformer.java diff --git a/jonas/jonas/src/org/objectweb/jonas/tools/migration/jboss/jboss.xml b/jonas/src/org/objectweb/jonas/tools/migration/jboss/jboss.xml similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/tools/migration/jboss/jboss.xml rename to jonas/src/org/objectweb/jonas/tools/migration/jboss/jboss.xml diff --git a/jonas/jonas/src/org/objectweb/jonas/tools/migration/jboss/jbosscmp-jdbc.xml b/jonas/src/org/objectweb/jonas/tools/migration/jboss/jbosscmp-jdbc.xml similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/tools/migration/jboss/jbosscmp-jdbc.xml rename to jonas/src/org/objectweb/jonas/tools/migration/jboss/jbosscmp-jdbc.xml diff --git a/jonas/jonas/src/org/objectweb/jonas/tools/migration/jboss/jonas-ejb-jar.xml b/jonas/src/org/objectweb/jonas/tools/migration/jboss/jonas-ejb-jar.xml similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/tools/migration/jboss/jonas-ejb-jar.xml rename to jonas/src/org/objectweb/jonas/tools/migration/jboss/jonas-ejb-jar.xml diff --git a/jonas/jonas/src/org/objectweb/jonas/web/AbsJWebContainerServiceImpl.java b/jonas/src/org/objectweb/jonas/web/AbsJWebContainerServiceImpl.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/web/AbsJWebContainerServiceImpl.java rename to jonas/src/org/objectweb/jonas/web/AbsJWebContainerServiceImpl.java diff --git a/jonas/jonas/src/org/objectweb/jonas/web/AbsJWebContainerServiceImplMBean.java b/jonas/src/org/objectweb/jonas/web/AbsJWebContainerServiceImplMBean.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/web/AbsJWebContainerServiceImplMBean.java rename to jonas/src/org/objectweb/jonas/web/AbsJWebContainerServiceImplMBean.java diff --git a/jonas/jonas/src/org/objectweb/jonas/web/JWebContainerService.java b/jonas/src/org/objectweb/jonas/web/JWebContainerService.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/web/JWebContainerService.java rename to jonas/src/org/objectweb/jonas/web/JWebContainerService.java diff --git a/jonas/jonas/src/org/objectweb/jonas/web/JWebContainerServiceException.java b/jonas/src/org/objectweb/jonas/web/JWebContainerServiceException.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/web/JWebContainerServiceException.java rename to jonas/src/org/objectweb/jonas/web/JWebContainerServiceException.java diff --git a/jonas/jonas/src/org/objectweb/jonas/web/War.java b/jonas/src/org/objectweb/jonas/web/War.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/web/War.java rename to jonas/src/org/objectweb/jonas/web/War.java diff --git a/jonas/jonas/src/org/objectweb/jonas/web/WarMBean.java b/jonas/src/org/objectweb/jonas/web/WarMBean.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/web/WarMBean.java rename to jonas/src/org/objectweb/jonas/web/WarMBean.java diff --git a/jonas/jonas/src/org/objectweb/jonas/web/catalina55/CatalinaConnectorFactory.java b/jonas/src/org/objectweb/jonas/web/catalina55/CatalinaConnectorFactory.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/web/catalina55/CatalinaConnectorFactory.java rename to jonas/src/org/objectweb/jonas/web/catalina55/CatalinaConnectorFactory.java diff --git a/jonas/jonas/src/org/objectweb/jonas/web/catalina55/CatalinaConnectorFactoryMBean.java b/jonas/src/org/objectweb/jonas/web/catalina55/CatalinaConnectorFactoryMBean.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/web/catalina55/CatalinaConnectorFactoryMBean.java rename to jonas/src/org/objectweb/jonas/web/catalina55/CatalinaConnectorFactoryMBean.java diff --git a/jonas/jonas/src/org/objectweb/jonas/web/catalina55/CatalinaJWebContainerServiceImpl.java b/jonas/src/org/objectweb/jonas/web/catalina55/CatalinaJWebContainerServiceImpl.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/web/catalina55/CatalinaJWebContainerServiceImpl.java rename to jonas/src/org/objectweb/jonas/web/catalina55/CatalinaJWebContainerServiceImpl.java diff --git a/jonas/jonas/src/org/objectweb/jonas/web/catalina55/I18n.properties b/jonas/src/org/objectweb/jonas/web/catalina55/I18n.properties similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/web/catalina55/I18n.properties rename to jonas/src/org/objectweb/jonas/web/catalina55/I18n.properties diff --git a/jonas/jonas/src/org/objectweb/jonas/web/catalina55/I18n_fr.properties b/jonas/src/org/objectweb/jonas/web/catalina55/I18n_fr.properties similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/web/catalina55/I18n_fr.properties rename to jonas/src/org/objectweb/jonas/web/catalina55/I18n_fr.properties diff --git a/jonas/jonas/src/org/objectweb/jonas/web/catalina55/JCatalinaRuleSet.java b/jonas/src/org/objectweb/jonas/web/catalina55/JCatalinaRuleSet.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/web/catalina55/JCatalinaRuleSet.java rename to jonas/src/org/objectweb/jonas/web/catalina55/JCatalinaRuleSet.java diff --git a/jonas/jonas/src/org/objectweb/jonas/web/catalina55/JOnASStandardContext.java b/jonas/src/org/objectweb/jonas/web/catalina55/JOnASStandardContext.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/web/catalina55/JOnASStandardContext.java rename to jonas/src/org/objectweb/jonas/web/catalina55/JOnASStandardContext.java diff --git a/jonas/jonas/src/org/objectweb/jonas/web/catalina55/ResetAuthenticationValve.java b/jonas/src/org/objectweb/jonas/web/catalina55/ResetAuthenticationValve.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/web/catalina55/ResetAuthenticationValve.java rename to jonas/src/org/objectweb/jonas/web/catalina55/ResetAuthenticationValve.java diff --git a/jonas/jonas/src/org/objectweb/jonas/web/catalina55/WebModuleProxy.java b/jonas/src/org/objectweb/jonas/web/catalina55/WebModuleProxy.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/web/catalina55/WebModuleProxy.java rename to jonas/src/org/objectweb/jonas/web/catalina55/WebModuleProxy.java diff --git a/jonas/jonas/src/org/objectweb/jonas/web/catalina55/WebModuleProxyMBean.java b/jonas/src/org/objectweb/jonas/web/catalina55/WebModuleProxyMBean.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/web/catalina55/WebModuleProxyMBean.java rename to jonas/src/org/objectweb/jonas/web/catalina55/WebModuleProxyMBean.java diff --git a/jonas/jonas/src/org/objectweb/jonas/web/catalina55/mbeans-descriptors.xml b/jonas/src/org/objectweb/jonas/web/catalina55/mbeans-descriptors.xml similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/web/catalina55/mbeans-descriptors.xml rename to jonas/src/org/objectweb/jonas/web/catalina55/mbeans-descriptors.xml diff --git a/jonas/jonas/src/org/objectweb/jonas/web/jetty50/JSR77Configuration.java b/jonas/src/org/objectweb/jonas/web/jetty50/JSR77Configuration.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/web/jetty50/JSR77Configuration.java rename to jonas/src/org/objectweb/jonas/web/jetty50/JSR77Configuration.java diff --git a/jonas/jonas/src/org/objectweb/jonas/web/jetty50/JettyJWebContainerServiceImpl.java b/jonas/src/org/objectweb/jonas/web/jetty50/JettyJWebContainerServiceImpl.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/web/jetty50/JettyJWebContainerServiceImpl.java rename to jonas/src/org/objectweb/jonas/web/jetty50/JettyJWebContainerServiceImpl.java diff --git a/jonas/jonas/src/org/objectweb/jonas/web/jetty50/JettyJonasServerMBean.java b/jonas/src/org/objectweb/jonas/web/jetty50/JettyJonasServerMBean.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/web/jetty50/JettyJonasServerMBean.java rename to jonas/src/org/objectweb/jonas/web/jetty50/JettyJonasServerMBean.java diff --git a/jonas/jonas/src/org/objectweb/jonas/web/jetty50/jmx/FixedJsr77ServletHolderMBean.java b/jonas/src/org/objectweb/jonas/web/jetty50/jmx/FixedJsr77ServletHolderMBean.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/web/jetty50/jmx/FixedJsr77ServletHolderMBean.java rename to jonas/src/org/objectweb/jonas/web/jetty50/jmx/FixedJsr77ServletHolderMBean.java diff --git a/jonas/jonas/src/org/objectweb/jonas/web/jetty50/jmx/J2EEWebModuleMBean.java b/jonas/src/org/objectweb/jonas/web/jetty50/jmx/J2EEWebModuleMBean.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/web/jetty50/jmx/J2EEWebModuleMBean.java rename to jonas/src/org/objectweb/jonas/web/jetty50/jmx/J2EEWebModuleMBean.java diff --git a/jonas/jonas/src/org/objectweb/jonas/web/jetty50/jmx/JSR77ConfigurationMBean.java b/jonas/src/org/objectweb/jonas/web/jetty50/jmx/JSR77ConfigurationMBean.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/web/jetty50/jmx/JSR77ConfigurationMBean.java rename to jonas/src/org/objectweb/jonas/web/jetty50/jmx/JSR77ConfigurationMBean.java diff --git a/jonas/jonas/src/org/objectweb/jonas/web/lib/JarTools.java b/jonas/src/org/objectweb/jonas/web/lib/JarTools.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/web/lib/JarTools.java rename to jonas/src/org/objectweb/jonas/web/lib/JarTools.java diff --git a/jonas/jonas/src/org/objectweb/jonas/web/lib/PermissionManager.java b/jonas/src/org/objectweb/jonas/web/lib/PermissionManager.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/web/lib/PermissionManager.java rename to jonas/src/org/objectweb/jonas/web/lib/PermissionManager.java diff --git a/jonas/jonas/src/org/objectweb/jonas/web/wrapper/CatalinaJWebContainerService.java b/jonas/src/org/objectweb/jonas/web/wrapper/CatalinaJWebContainerService.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/web/wrapper/CatalinaJWebContainerService.java rename to jonas/src/org/objectweb/jonas/web/wrapper/CatalinaJWebContainerService.java diff --git a/jonas/jonas/src/org/objectweb/jonas/web/wrapper/catalina50/CatalinaJWebContainerServiceWrapper.java b/jonas/src/org/objectweb/jonas/web/wrapper/catalina50/CatalinaJWebContainerServiceWrapper.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/web/wrapper/catalina50/CatalinaJWebContainerServiceWrapper.java rename to jonas/src/org/objectweb/jonas/web/wrapper/catalina50/CatalinaJWebContainerServiceWrapper.java diff --git a/jonas/jonas/src/org/objectweb/jonas/web/wrapper/catalina55/CatalinaJWebContainerServiceWrapper.java b/jonas/src/org/objectweb/jonas/web/wrapper/catalina55/CatalinaJWebContainerServiceWrapper.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/web/wrapper/catalina55/CatalinaJWebContainerServiceWrapper.java rename to jonas/src/org/objectweb/jonas/web/wrapper/catalina55/CatalinaJWebContainerServiceWrapper.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/ctxroot/default/index.jsp b/jonas/src/org/objectweb/jonas/webapp/ctxroot/default/index.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/ctxroot/default/index.jsp rename to jonas/src/org/objectweb/jonas/webapp/ctxroot/default/index.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/ctxroot/default/jetty.gif b/jonas/src/org/objectweb/jonas/webapp/ctxroot/default/jetty.gif similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/ctxroot/default/jetty.gif rename to jonas/src/org/objectweb/jonas/webapp/ctxroot/default/jetty.gif diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/ctxroot/default/jonas-web.xml b/jonas/src/org/objectweb/jonas/webapp/ctxroot/default/jonas-web.xml similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/ctxroot/default/jonas-web.xml rename to jonas/src/org/objectweb/jonas/webapp/ctxroot/default/jonas-web.xml diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/ctxroot/default/ow_jonas.css b/jonas/src/org/objectweb/jonas/webapp/ctxroot/default/ow_jonas.css similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/ctxroot/default/ow_jonas.css rename to jonas/src/org/objectweb/jonas/webapp/ctxroot/default/ow_jonas.css diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/ctxroot/default/ow_jonas_logo.gif b/jonas/src/org/objectweb/jonas/webapp/ctxroot/default/ow_jonas_logo.gif similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/ctxroot/default/ow_jonas_logo.gif rename to jonas/src/org/objectweb/jonas/webapp/ctxroot/default/ow_jonas_logo.gif diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/ctxroot/default/ow_logo.png b/jonas/src/org/objectweb/jonas/webapp/ctxroot/default/ow_logo.png similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/ctxroot/default/ow_logo.png rename to jonas/src/org/objectweb/jonas/webapp/ctxroot/default/ow_logo.png diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/ctxroot/default/style.css b/jonas/src/org/objectweb/jonas/webapp/ctxroot/default/style.css similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/ctxroot/default/style.css rename to jonas/src/org/objectweb/jonas/webapp/ctxroot/default/style.css diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/ctxroot/default/tomcat.gif b/jonas/src/org/objectweb/jonas/webapp/ctxroot/default/tomcat.gif similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/ctxroot/default/tomcat.gif rename to jonas/src/org/objectweb/jonas/webapp/ctxroot/default/tomcat.gif diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/ctxroot/default/valid-xhtml11.png b/jonas/src/org/objectweb/jonas/webapp/ctxroot/default/valid-xhtml11.png similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/ctxroot/default/valid-xhtml11.png rename to jonas/src/org/objectweb/jonas/webapp/ctxroot/default/valid-xhtml11.png diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/ctxroot/default/vcss.png b/jonas/src/org/objectweb/jonas/webapp/ctxroot/default/vcss.png similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/ctxroot/default/vcss.png rename to jonas/src/org/objectweb/jonas/webapp/ctxroot/default/vcss.png diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/ctxroot/default/web.xml b/jonas/src/org/objectweb/jonas/webapp/ctxroot/default/web.xml similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/ctxroot/default/web.xml rename to jonas/src/org/objectweb/jonas/webapp/ctxroot/default/web.xml diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/ApplicationLocales.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/ApplicationLocales.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/ApplicationLocales.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/ApplicationLocales.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/ApplicationResources.properties b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/ApplicationResources.properties similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/ApplicationResources.properties rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/ApplicationResources.properties diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/ApplicationResources_fr.properties b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/ApplicationResources_fr.properties similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/ApplicationResources_fr.properties rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/ApplicationResources_fr.properties diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/ApplyTopAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/ApplyTopAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/ApplyTopAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/ApplyTopAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/EditTopAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/EditTopAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/EditTopAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/EditTopAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/JettyObjectName.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/JettyObjectName.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/JettyObjectName.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/JettyObjectName.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/Jlists.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/Jlists.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/Jlists.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/Jlists.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/JmsConnFact.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/JmsConnFact.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/JmsConnFact.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/JmsConnFact.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/JonasAdminException.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/JonasAdminException.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/JonasAdminException.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/JonasAdminException.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/JonasAdminJmx.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/JonasAdminJmx.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/JonasAdminJmx.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/JonasAdminJmx.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/JonasBaseAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/JonasBaseAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/JonasBaseAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/JonasBaseAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/JonasServerItem.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/JonasServerItem.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/JonasServerItem.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/JonasServerItem.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/JonasTreeBuilder.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/JonasTreeBuilder.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/JonasTreeBuilder.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/JonasTreeBuilder.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/LogOutAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/LogOutAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/LogOutAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/LogOutAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/MBeanTreeBuilder.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/MBeanTreeBuilder.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/MBeanTreeBuilder.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/MBeanTreeBuilder.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/SetUpTreeAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/SetUpTreeAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/SetUpTreeAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/SetUpTreeAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/SetupWhereAreYouAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/SetupWhereAreYouAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/SetupWhereAreYouAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/SetupWhereAreYouAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/TopForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/TopForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/TopForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/TopForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/TreeAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/TreeAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/TreeAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/TreeAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/WhereAreYou.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/WhereAreYou.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/WhereAreYou.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/WhereAreYou.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/catalina/ApplyConnectorAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/catalina/ApplyConnectorAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/catalina/ApplyConnectorAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/catalina/ApplyConnectorAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/catalina/ApplyConnectorsAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/catalina/ApplyConnectorsAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/catalina/ApplyConnectorsAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/catalina/ApplyConnectorsAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/catalina/ApplyConnectorsConfirmAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/catalina/ApplyConnectorsConfirmAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/catalina/ApplyConnectorsConfirmAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/catalina/ApplyConnectorsConfirmAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/catalina/CatalinaBaseAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/catalina/CatalinaBaseAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/catalina/CatalinaBaseAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/catalina/CatalinaBaseAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/catalina/ConnectorForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/catalina/ConnectorForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/catalina/ConnectorForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/catalina/ConnectorForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/catalina/ConnectorItem.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/catalina/ConnectorItem.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/catalina/ConnectorItem.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/catalina/ConnectorItem.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/catalina/ConnectorItemByPort.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/catalina/ConnectorItemByPort.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/catalina/ConnectorItemByPort.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/catalina/ConnectorItemByPort.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/catalina/CreateConnectorAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/catalina/CreateConnectorAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/catalina/CreateConnectorAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/catalina/CreateConnectorAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/catalina/EditConnectorAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/catalina/EditConnectorAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/catalina/EditConnectorAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/catalina/EditConnectorAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/catalina/ItemsConnectorsForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/catalina/ItemsConnectorsForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/catalina/ItemsConnectorsForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/catalina/ItemsConnectorsForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/catalina/ListConnectorsAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/catalina/ListConnectorsAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/catalina/ListConnectorsAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/catalina/ListConnectorsAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/catalina/SaveCatalinaAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/catalina/SaveCatalinaAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/catalina/SaveCatalinaAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/catalina/SaveCatalinaAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/common/BeanComparator.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/common/BeanComparator.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/common/BeanComparator.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/common/BeanComparator.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/common/ItemsForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/common/ItemsForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/common/ItemsForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/common/ItemsForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/common/LabelValueByLabelComparator.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/common/LabelValueByLabelComparator.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/common/LabelValueByLabelComparator.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/common/LabelValueByLabelComparator.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/common/ModuleItem.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/common/ModuleItem.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/common/ModuleItem.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/common/ModuleItem.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/common/ModuleItemByName.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/common/ModuleItemByName.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/common/ModuleItemByName.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/common/ModuleItemByName.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/common/NameItem.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/common/NameItem.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/common/NameItem.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/common/NameItem.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/common/ObjectNameComparator.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/common/ObjectNameComparator.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/common/ObjectNameComparator.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/common/ObjectNameComparator.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/common/ObjectNameItem.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/common/ObjectNameItem.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/common/ObjectNameItem.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/common/ObjectNameItem.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/deploy/ApplyDeployAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/deploy/ApplyDeployAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/deploy/ApplyDeployAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/deploy/ApplyDeployAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/deploy/ApplyDeployConfirmAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/deploy/ApplyDeployConfirmAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/deploy/ApplyDeployConfirmAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/deploy/ApplyDeployConfirmAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/deploy/ApplyDomainDeployAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/deploy/ApplyDomainDeployAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/deploy/ApplyDomainDeployAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/deploy/ApplyDomainDeployAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/deploy/ApplyDomainDeployConfirmAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/deploy/ApplyDomainDeployConfirmAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/deploy/ApplyDomainDeployConfirmAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/deploy/ApplyDomainDeployConfirmAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/deploy/ApplyRemoveAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/deploy/ApplyRemoveAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/deploy/ApplyRemoveAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/deploy/ApplyRemoveAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/deploy/ApplyRemoveConfirmAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/deploy/ApplyRemoveConfirmAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/deploy/ApplyRemoveConfirmAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/deploy/ApplyRemoveConfirmAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/deploy/ApplyUploadAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/deploy/ApplyUploadAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/deploy/ApplyUploadAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/deploy/ApplyUploadAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/deploy/BaseDeployAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/deploy/BaseDeployAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/deploy/BaseDeployAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/deploy/BaseDeployAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/deploy/DeployForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/deploy/DeployForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/deploy/DeployForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/deploy/DeployForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/deploy/DomainDeployForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/deploy/DomainDeployForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/deploy/DomainDeployForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/deploy/DomainDeployForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/deploy/EditDeployAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/deploy/EditDeployAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/deploy/EditDeployAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/deploy/EditDeployAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/deploy/EditDomainDeployAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/deploy/EditDomainDeployAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/deploy/EditDomainDeployAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/deploy/EditDomainDeployAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/deploy/EditRemoveAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/deploy/EditRemoveAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/deploy/EditRemoveAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/deploy/EditRemoveAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/deploy/EditUploadAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/deploy/EditUploadAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/deploy/EditUploadAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/deploy/EditUploadAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/deploy/OperationInProgressException.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/deploy/OperationInProgressException.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/deploy/OperationInProgressException.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/deploy/OperationInProgressException.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/deploy/RemoveForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/deploy/RemoveForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/deploy/RemoveForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/deploy/RemoveForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/deploy/UploadForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/deploy/UploadForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/deploy/UploadForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/deploy/UploadForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/domain/ApplyClusterAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/domain/ApplyClusterAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/domain/ApplyClusterAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/domain/ApplyClusterAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/domain/ApplyJonasServerAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/domain/ApplyJonasServerAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/domain/ApplyJonasServerAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/domain/ApplyJonasServerAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/domain/ApplyJonasServersAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/domain/ApplyJonasServersAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/domain/ApplyJonasServersAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/domain/ApplyJonasServersAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/domain/ApplyJonasServersConfirmAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/domain/ApplyJonasServersConfirmAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/domain/ApplyJonasServersConfirmAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/domain/ApplyJonasServersConfirmAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/domain/ApplyJonasServersConfirmMoveAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/domain/ApplyJonasServersConfirmMoveAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/domain/ApplyJonasServersConfirmMoveAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/domain/ApplyJonasServersConfirmMoveAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/domain/CreateClusterAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/domain/CreateClusterAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/domain/CreateClusterAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/domain/CreateClusterAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/domain/CreateJonasServerAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/domain/CreateJonasServerAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/domain/CreateJonasServerAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/domain/CreateJonasServerAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/domain/DomainForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/domain/DomainForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/domain/DomainForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/domain/DomainForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/domain/EditDomainAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/domain/EditDomainAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/domain/EditDomainAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/domain/EditDomainAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/domain/ItemsServersForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/domain/ItemsServersForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/domain/ItemsServersForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/domain/ItemsServersForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/domain/JonasServerItem.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/domain/JonasServerItem.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/domain/JonasServerItem.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/domain/JonasServerItem.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/domain/JonasServersMoveAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/domain/JonasServersMoveAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/domain/JonasServersMoveAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/domain/JonasServersMoveAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/domain/ModuleItem.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/domain/ModuleItem.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/domain/ModuleItem.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/domain/ModuleItem.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/domain/NewClusterForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/domain/NewClusterForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/domain/NewClusterForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/domain/NewClusterForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/domain/NewServerForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/domain/NewServerForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/domain/NewServerForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/domain/NewServerForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/domain/ServerItem.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/domain/ServerItem.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/domain/ServerItem.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/domain/ServerItem.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/domain/StartClusterAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/domain/StartClusterAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/domain/StartClusterAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/domain/StartClusterAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/domain/StartClusterDaemonAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/domain/StartClusterDaemonAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/domain/StartClusterDaemonAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/domain/StartClusterDaemonAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/domain/StartJonasServerAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/domain/StartJonasServerAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/domain/StartJonasServerAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/domain/StartJonasServerAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/domain/StopClusterAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/domain/StopClusterAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/domain/StopClusterAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/domain/StopClusterAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/domain/StopClusterDaemonAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/domain/StopClusterDaemonAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/domain/StopClusterDaemonAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/domain/StopClusterDaemonAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/domain/StopJonasServerAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/domain/StopJonasServerAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/domain/StopJonasServerAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/domain/StopJonasServerAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/etc/controls.tld b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/etc/controls.tld similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/etc/controls.tld rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/etc/controls.tld diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/etc/sj.tld b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/etc/sj.tld similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/etc/sj.tld rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/etc/sj.tld diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/etc/struts-bean.tld b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/etc/struts-bean.tld similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/etc/struts-bean.tld rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/etc/struts-bean.tld diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/etc/struts-config.xml b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/etc/struts-config.xml similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/etc/struts-config.xml rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/etc/struts-config.xml diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/etc/struts-html.tld b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/etc/struts-html.tld similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/etc/struts-html.tld rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/etc/struts-html.tld diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/etc/struts-logic.tld b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/etc/struts-logic.tld similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/etc/struts-logic.tld rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/etc/struts-logic.tld diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/etc/struts-template.tld b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/etc/struts-template.tld similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/etc/struts-template.tld rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/etc/struts-template.tld diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/etc/web.xml b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/etc/web.xml similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/etc/web.xml rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/etc/web.xml diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/jonasserver/BasicJonasServerForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/jonasserver/BasicJonasServerForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/jonasserver/BasicJonasServerForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/jonasserver/BasicJonasServerForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/jonasserver/CmiRegistryResource.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/jonasserver/CmiRegistryResource.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/jonasserver/CmiRegistryResource.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/jonasserver/CmiRegistryResource.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/jonasserver/EditJmxServerAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/jonasserver/EditJmxServerAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/jonasserver/EditJmxServerAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/jonasserver/EditJmxServerAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/jonasserver/EditJonasServerAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/jonasserver/EditJonasServerAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/jonasserver/EditJonasServerAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/jonasserver/EditJonasServerAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/jonasserver/EditJvmAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/jonasserver/EditJvmAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/jonasserver/EditJvmAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/jonasserver/EditJvmAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/jonasserver/EditRegistryAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/jonasserver/EditRegistryAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/jonasserver/EditRegistryAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/jonasserver/EditRegistryAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/jonasserver/EditServletServerAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/jonasserver/EditServletServerAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/jonasserver/EditServletServerAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/jonasserver/EditServletServerAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/jonasserver/JmxServerForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/jonasserver/JmxServerForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/jonasserver/JmxServerForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/jonasserver/JmxServerForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/jonasserver/JndiResourceForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/jonasserver/JndiResourceForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/jonasserver/JndiResourceForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/jonasserver/JndiResourceForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/jonasserver/JndiResourceItem.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/jonasserver/JndiResourceItem.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/jonasserver/JndiResourceItem.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/jonasserver/JndiResourceItem.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/jonasserver/JndiResourcesForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/jonasserver/JndiResourcesForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/jonasserver/JndiResourcesForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/jonasserver/JndiResourcesForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/jonasserver/JonasServerForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/jonasserver/JonasServerForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/jonasserver/JonasServerForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/jonasserver/JonasServerForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/jonasserver/JonasServerRunGCAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/jonasserver/JonasServerRunGCAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/jonasserver/JonasServerRunGCAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/jonasserver/JonasServerRunGCAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/jonasserver/JonasServerStopAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/jonasserver/JonasServerStopAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/jonasserver/JonasServerStopAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/jonasserver/JonasServerStopAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/jonasserver/JvmForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/jonasserver/JvmForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/jonasserver/JvmForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/jonasserver/JvmForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/jonasserver/ListRegistryAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/jonasserver/ListRegistryAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/jonasserver/ListRegistryAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/jonasserver/ListRegistryAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/jonasserver/ServletServerForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/jonasserver/ServletServerForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/jonasserver/ServletServerForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/jonasserver/ServletServerForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/AddJoramReaderAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/AddJoramReaderAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/AddJoramReaderAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/AddJoramReaderAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/AddJoramWriterAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/AddJoramWriterAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/AddJoramWriterAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/AddJoramWriterAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/ApplyDestinationAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/ApplyDestinationAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/ApplyDestinationAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/ApplyDestinationAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/ApplyJoramQueueAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/ApplyJoramQueueAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/ApplyJoramQueueAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/ApplyJoramQueueAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/ApplyJoramReaderAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/ApplyJoramReaderAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/ApplyJoramReaderAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/ApplyJoramReaderAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/ApplyJoramTopicAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/ApplyJoramTopicAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/ApplyJoramTopicAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/ApplyJoramTopicAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/ApplyJoramWriterAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/ApplyJoramWriterAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/ApplyJoramWriterAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/ApplyJoramWriterAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/ApplyLocalDestinationAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/ApplyLocalDestinationAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/ApplyLocalDestinationAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/ApplyLocalDestinationAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/ApplyUserAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/ApplyUserAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/ApplyUserAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/ApplyUserAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/CreateJoramDestinationAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/CreateJoramDestinationAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/CreateJoramDestinationAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/CreateJoramDestinationAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/CreateJoramLocalDestinationAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/CreateJoramLocalDestinationAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/CreateJoramLocalDestinationAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/CreateJoramLocalDestinationAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/CreateJoramUserAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/CreateJoramUserAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/CreateJoramUserAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/CreateJoramUserAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/DestinationForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/DestinationForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/DestinationForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/DestinationForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/DestinationItem.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/DestinationItem.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/DestinationItem.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/DestinationItem.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/DestinationItemByNameComparator.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/DestinationItemByNameComparator.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/DestinationItemByNameComparator.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/DestinationItemByNameComparator.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/EditJoramBaseAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/EditJoramBaseAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/EditJoramBaseAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/EditJoramBaseAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/EditJoramDestinationAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/EditJoramDestinationAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/EditJoramDestinationAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/EditJoramDestinationAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/EditJoramLocalServerAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/EditJoramLocalServerAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/EditJoramLocalServerAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/EditJoramLocalServerAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/EditJoramPlatformAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/EditJoramPlatformAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/EditJoramPlatformAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/EditJoramPlatformAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/EditJoramQueueAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/EditJoramQueueAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/EditJoramQueueAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/EditJoramQueueAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/EditJoramRemoteServerAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/EditJoramRemoteServerAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/EditJoramRemoteServerAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/EditJoramRemoteServerAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/EditJoramResourceAdapterAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/EditJoramResourceAdapterAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/EditJoramResourceAdapterAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/EditJoramResourceAdapterAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/EditJoramServerAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/EditJoramServerAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/EditJoramServerAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/EditJoramServerAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/EditJoramTopicAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/EditJoramTopicAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/EditJoramTopicAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/EditJoramTopicAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/EditJoramUserAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/EditJoramUserAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/EditJoramUserAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/EditJoramUserAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/ExportRepository.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/ExportRepository.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/ExportRepository.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/ExportRepository.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/ItemBase.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/ItemBase.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/ItemBase.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/ItemBase.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/ItemDestination.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/ItemDestination.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/ItemDestination.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/ItemDestination.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/ItemDestinationByName.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/ItemDestinationByName.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/ItemDestinationByName.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/ItemDestinationByName.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/ItemUser.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/ItemUser.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/ItemUser.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/ItemUser.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/JoramAdapterForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/JoramAdapterForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/JoramAdapterForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/JoramAdapterForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/JoramDestinationForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/JoramDestinationForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/JoramDestinationForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/JoramDestinationForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/JoramLocalQueueForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/JoramLocalQueueForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/JoramLocalQueueForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/JoramLocalQueueForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/JoramLocalServerForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/JoramLocalServerForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/JoramLocalServerForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/JoramLocalServerForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/JoramLocalTopicForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/JoramLocalTopicForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/JoramLocalTopicForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/JoramLocalTopicForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/JoramPlatformForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/JoramPlatformForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/JoramPlatformForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/JoramPlatformForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/JoramQueueForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/JoramQueueForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/JoramQueueForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/JoramQueueForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/JoramReaderWriterForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/JoramReaderWriterForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/JoramReaderWriterForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/JoramReaderWriterForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/JoramRemoteServerForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/JoramRemoteServerForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/JoramRemoteServerForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/JoramRemoteServerForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/JoramServersForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/JoramServersForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/JoramServersForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/JoramServersForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/JoramTopicForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/JoramTopicForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/JoramTopicForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/JoramTopicForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/JoramUserForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/JoramUserForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/JoramUserForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/JoramUserForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/ListJoramServersAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/ListJoramServersAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/ListJoramServersAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/ListJoramServersAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/ListLocalDestinationsAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/ListLocalDestinationsAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/ListLocalDestinationsAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/ListLocalDestinationsAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/ListRemoteDestinationsAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/ListRemoteDestinationsAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/ListRemoteDestinationsAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/ListRemoteDestinationsAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/MonitoringDestForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/MonitoringDestForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/MonitoringDestForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/MonitoringDestForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/ReloadJoramAdmin.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/ReloadJoramAdmin.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/ReloadJoramAdmin.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/ReloadJoramAdmin.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/RemoveConfirmDestinationsAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/RemoveConfirmDestinationsAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/RemoveConfirmDestinationsAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/RemoveConfirmDestinationsAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/RemoveConfirmUsersAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/RemoveConfirmUsersAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/RemoveConfirmUsersAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/RemoveConfirmUsersAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/RemoveDestinationsForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/RemoveDestinationsForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/RemoveDestinationsForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/RemoveDestinationsForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/RemoveJoramDestinationsAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/RemoveJoramDestinationsAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/RemoveJoramDestinationsAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/RemoveJoramDestinationsAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/RemoveJoramUsersAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/RemoveJoramUsersAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/RemoveJoramUsersAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/RemoveJoramUsersAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/RemoveUsersForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/RemoveUsersForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/RemoveUsersForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/joramplatform/RemoveUsersForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/logging/ApplyCatalinaAccessLoggerAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/logging/ApplyCatalinaAccessLoggerAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/logging/ApplyCatalinaAccessLoggerAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/logging/ApplyCatalinaAccessLoggerAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/logging/ApplyLoggersAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/logging/ApplyLoggersAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/logging/ApplyLoggersAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/logging/ApplyLoggersAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/logging/ApplyLoggersConfirmAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/logging/ApplyLoggersConfirmAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/logging/ApplyLoggersConfirmAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/logging/ApplyLoggersConfirmAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/logging/ApplyLoggingJonasAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/logging/ApplyLoggingJonasAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/logging/ApplyLoggingJonasAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/logging/ApplyLoggingJonasAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/logging/BaseLoggerAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/logging/BaseLoggerAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/logging/BaseLoggerAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/logging/BaseLoggerAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/logging/CatalinaAccessLogValveForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/logging/CatalinaAccessLogValveForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/logging/CatalinaAccessLogValveForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/logging/CatalinaAccessLogValveForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/logging/CatalinaValveForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/logging/CatalinaValveForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/logging/CatalinaValveForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/logging/CatalinaValveForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/logging/EditCatalinaAccessLoggerAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/logging/EditCatalinaAccessLoggerAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/logging/EditCatalinaAccessLoggerAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/logging/EditCatalinaAccessLoggerAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/logging/EditLoggingJonasAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/logging/EditLoggingJonasAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/logging/EditLoggingJonasAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/logging/EditLoggingJonasAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/logging/ListLoggersAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/logging/ListLoggersAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/logging/ListLoggersAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/logging/ListLoggersAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/logging/LoggerItem.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/logging/LoggerItem.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/logging/LoggerItem.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/logging/LoggerItem.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/logging/LoggingJonasForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/logging/LoggingJonasForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/logging/LoggingJonasForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/logging/LoggingJonasForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/logging/TopicLevel.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/logging/TopicLevel.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/logging/TopicLevel.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/logging/TopicLevel.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/mbean/ApplyMbeanFilteringAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/mbean/ApplyMbeanFilteringAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/mbean/ApplyMbeanFilteringAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/mbean/ApplyMbeanFilteringAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/mbean/J2eeMbeanItem.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/mbean/J2eeMbeanItem.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/mbean/J2eeMbeanItem.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/mbean/J2eeMbeanItem.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/mbean/ListJ2eeMBeansAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/mbean/ListJ2eeMBeansAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/mbean/ListJ2eeMBeansAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/mbean/ListJ2eeMBeansAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/mbean/ListMBeanAttributesAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/mbean/ListMBeanAttributesAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/mbean/ListMBeanAttributesAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/mbean/ListMBeanAttributesAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/mbean/ListMBeanDetailsAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/mbean/ListMBeanDetailsAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/mbean/ListMBeanDetailsAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/mbean/ListMBeanDetailsAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/mbean/ListMBeanOperationsAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/mbean/ListMBeanOperationsAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/mbean/ListMBeanOperationsAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/mbean/ListMBeanOperationsAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/mbean/ListMBeanPropertiesAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/mbean/ListMBeanPropertiesAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/mbean/ListMBeanPropertiesAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/mbean/ListMBeanPropertiesAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/mbean/ListMBeansAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/mbean/ListMBeansAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/mbean/ListMBeansAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/mbean/ListMBeansAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/mbean/ListOwnerMBeansAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/mbean/ListOwnerMBeansAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/mbean/ListOwnerMBeansAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/mbean/ListOwnerMBeansAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/mbean/ListUnknownMBeansAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/mbean/ListUnknownMBeansAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/mbean/ListUnknownMBeansAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/mbean/ListUnknownMBeansAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/mbean/MbeanFilteringForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/mbean/MbeanFilteringForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/mbean/MbeanFilteringForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/mbean/MbeanFilteringForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/mbean/MbeanItem.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/mbean/MbeanItem.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/mbean/MbeanItem.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/mbean/MbeanItem.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/mbean/OwnerMbeanItem.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/mbean/OwnerMbeanItem.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/mbean/OwnerMbeanItem.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/mbean/OwnerMbeanItem.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/ApplyMemoryAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/ApplyMemoryAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/ApplyMemoryAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/ApplyMemoryAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/ApplyMonitoringAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/ApplyMonitoringAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/ApplyMonitoringAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/ApplyMonitoringAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/BaseClusterForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/BaseClusterForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/BaseClusterForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/BaseClusterForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/CmiClusterAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/CmiClusterAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/CmiClusterAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/CmiClusterAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/CmiClusterForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/CmiClusterForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/CmiClusterForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/CmiClusterForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/CmiMemberAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/CmiMemberAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/CmiMemberAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/CmiMemberAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/CmiMemberForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/CmiMemberForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/CmiMemberForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/CmiMemberForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/DaemonProxyClusterAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/DaemonProxyClusterAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/DaemonProxyClusterAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/DaemonProxyClusterAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/DaemonProxyClusterForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/DaemonProxyClusterForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/DaemonProxyClusterForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/DaemonProxyClusterForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/DaemonProxyMemberAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/DaemonProxyMemberAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/DaemonProxyMemberAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/DaemonProxyMemberAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/DaemonProxyMemberForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/DaemonProxyMemberForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/DaemonProxyMemberForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/DaemonProxyMemberForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/DisplayNodeInfoAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/DisplayNodeInfoAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/DisplayNodeInfoAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/DisplayNodeInfoAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/EditMemoryAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/EditMemoryAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/EditMemoryAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/EditMemoryAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/EditMonitoringAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/EditMonitoringAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/EditMonitoringAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/EditMonitoringAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/EjbHaClusterAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/EjbHaClusterAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/EjbHaClusterAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/EjbHaClusterAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/EjbHaClusterForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/EjbHaClusterForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/EjbHaClusterForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/EjbHaClusterForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/EjbHaMemberAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/EjbHaMemberAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/EjbHaMemberAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/EjbHaMemberAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/EjbHaMemberForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/EjbHaMemberForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/EjbHaMemberForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/EjbHaMemberForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/JkClusterAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/JkClusterAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/JkClusterAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/JkClusterAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/JkClusterForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/JkClusterForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/JkClusterForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/JkClusterForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/JkMemberAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/JkMemberAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/JkMemberAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/JkMemberAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/JkMemberForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/JkMemberForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/JkMemberForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/JkMemberForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/JoramClusterAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/JoramClusterAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/JoramClusterAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/JoramClusterAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/JoramClusterForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/JoramClusterForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/JoramClusterForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/JoramClusterForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/JoramMemberAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/JoramMemberAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/JoramMemberAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/JoramMemberAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/JoramMemberForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/JoramMemberForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/JoramMemberForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/JoramMemberForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/LogicalClusterAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/LogicalClusterAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/LogicalClusterAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/LogicalClusterAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/LogicalClusterForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/LogicalClusterForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/LogicalClusterForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/LogicalClusterForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/LogicalMemberAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/LogicalMemberAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/LogicalMemberAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/LogicalMemberAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/LogicalMemberForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/LogicalMemberForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/LogicalMemberForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/LogicalMemberForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/MemoryForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/MemoryForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/MemoryForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/MemoryForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/MemoryGraphServlet.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/MemoryGraphServlet.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/MemoryGraphServlet.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/MemoryGraphServlet.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/MonitoringForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/MonitoringForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/MonitoringForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/MonitoringForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/NodeInfoForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/NodeInfoForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/NodeInfoForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/NodeInfoForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/PingAllJonasServersAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/PingAllJonasServersAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/PingAllJonasServersAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/PingAllJonasServersAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/StartAllJonasServersAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/StartAllJonasServersAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/StartAllJonasServersAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/StartAllJonasServersAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/StopAllJonasServersAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/StopAllJonasServersAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/StopAllJonasServersAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/StopAllJonasServersAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/TomcatClusterAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/TomcatClusterAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/TomcatClusterAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/TomcatClusterAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/TomcatClusterForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/TomcatClusterForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/TomcatClusterForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/TomcatClusterForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/TomcatMemberAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/TomcatMemberAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/TomcatMemberAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/TomcatMemberAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/TomcatMemberForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/TomcatMemberForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/TomcatMemberForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/TomcatMemberForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/resource/ApplyConfirmDestinationsAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/resource/ApplyConfirmDestinationsAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/resource/ApplyConfirmDestinationsAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/resource/ApplyConfirmDestinationsAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/resource/ApplyDatasourcePropertiesAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/resource/ApplyDatasourcePropertiesAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/resource/ApplyDatasourcePropertiesAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/resource/ApplyDatasourcePropertiesAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/resource/ApplyDestinationAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/resource/ApplyDestinationAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/resource/ApplyDestinationAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/resource/ApplyDestinationAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/resource/ApplyDestinationsAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/resource/ApplyDestinationsAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/resource/ApplyDestinationsAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/resource/ApplyDestinationsAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/resource/ApplyMailFactoryPropertiesAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/resource/ApplyMailFactoryPropertiesAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/resource/ApplyMailFactoryPropertiesAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/resource/ApplyMailFactoryPropertiesAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/resource/ApplyMimePartMailFactoryPropertiesAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/resource/ApplyMimePartMailFactoryPropertiesAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/resource/ApplyMimePartMailFactoryPropertiesAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/resource/ApplyMimePartMailFactoryPropertiesAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/resource/ApplySessionMailFactoryPropertiesAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/resource/ApplySessionMailFactoryPropertiesAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/resource/ApplySessionMailFactoryPropertiesAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/resource/ApplySessionMailFactoryPropertiesAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/resource/DatasourcePropertiesForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/resource/DatasourcePropertiesForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/resource/DatasourcePropertiesForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/resource/DatasourcePropertiesForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/resource/DestinationForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/resource/DestinationForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/resource/DestinationForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/resource/DestinationForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/resource/DestinationItem.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/resource/DestinationItem.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/resource/DestinationItem.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/resource/DestinationItem.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/resource/DestinationItemByNameComparator.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/resource/DestinationItemByNameComparator.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/resource/DestinationItemByNameComparator.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/resource/DestinationItemByNameComparator.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/resource/EditDatasourcePropertiesAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/resource/EditDatasourcePropertiesAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/resource/EditDatasourcePropertiesAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/resource/EditDatasourcePropertiesAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/resource/EditDestinationAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/resource/EditDestinationAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/resource/EditDestinationAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/resource/EditDestinationAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/resource/EditMailFactoryPropertiesAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/resource/EditMailFactoryPropertiesAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/resource/EditMailFactoryPropertiesAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/resource/EditMailFactoryPropertiesAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/resource/EditMimePartMailFactoryPropertiesAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/resource/EditMimePartMailFactoryPropertiesAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/resource/EditMimePartMailFactoryPropertiesAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/resource/EditMimePartMailFactoryPropertiesAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/resource/EditSessionMailFactoryPropertiesAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/resource/EditSessionMailFactoryPropertiesAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/resource/EditSessionMailFactoryPropertiesAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/resource/EditSessionMailFactoryPropertiesAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/resource/ItemsDestinationsForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/resource/ItemsDestinationsForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/resource/ItemsDestinationsForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/resource/ItemsDestinationsForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/resource/ListDatasourcesAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/resource/ListDatasourcesAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/resource/ListDatasourcesAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/resource/ListDatasourcesAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/resource/ListJmsResourcesAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/resource/ListJmsResourcesAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/resource/ListJmsResourcesAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/resource/ListJmsResourcesAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/resource/ListMailFactoriesAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/resource/ListMailFactoriesAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/resource/ListMailFactoriesAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/resource/ListMailFactoriesAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/resource/MailFactoryItem.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/resource/MailFactoryItem.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/resource/MailFactoryItem.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/resource/MailFactoryItem.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/resource/MailFactoryPropertiesForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/resource/MailFactoryPropertiesForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/resource/MailFactoryPropertiesForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/resource/MailFactoryPropertiesForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/resource/SaveDestinationAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/resource/SaveDestinationAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/resource/SaveDestinationAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/resource/SaveDestinationAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/resourceadapter/ApplyCreateResourceAdapterAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/resourceadapter/ApplyCreateResourceAdapterAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/resourceadapter/ApplyCreateResourceAdapterAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/resourceadapter/ApplyCreateResourceAdapterAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/resourceadapter/ApplyTemplateCreateResourceAdapterAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/resourceadapter/ApplyTemplateCreateResourceAdapterAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/resourceadapter/ApplyTemplateCreateResourceAdapterAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/resourceadapter/ApplyTemplateCreateResourceAdapterAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/resourceadapter/CreateResourceAdapterAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/resourceadapter/CreateResourceAdapterAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/resourceadapter/CreateResourceAdapterAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/resourceadapter/CreateResourceAdapterAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/resourceadapter/CreateResourceAdapterForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/resourceadapter/CreateResourceAdapterForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/resourceadapter/CreateResourceAdapterForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/resourceadapter/CreateResourceAdapterForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/resourceadapter/jonas-ra-xml.vm b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/resourceadapter/jonas-ra-xml.vm similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/resourceadapter/jonas-ra-xml.vm rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/resourceadapter/jonas-ra-xml.vm diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/resourceadapter/ra-xml.vm b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/resourceadapter/ra-xml.vm similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/resourceadapter/ra-xml.vm rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/resourceadapter/ra-xml.vm diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/ApplyConfirmMemoryRealmAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/ApplyConfirmMemoryRealmAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/ApplyConfirmMemoryRealmAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/ApplyConfirmMemoryRealmAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/ApplyConfirmRealmsAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/ApplyConfirmRealmsAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/ApplyConfirmRealmsAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/ApplyConfirmRealmsAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/ApplyDatasourceRealmAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/ApplyDatasourceRealmAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/ApplyDatasourceRealmAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/ApplyDatasourceRealmAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/ApplyGroupMemoryRealmAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/ApplyGroupMemoryRealmAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/ApplyGroupMemoryRealmAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/ApplyGroupMemoryRealmAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/ApplyLdapRealmAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/ApplyLdapRealmAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/ApplyLdapRealmAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/ApplyLdapRealmAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/ApplyMemoryRealmAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/ApplyMemoryRealmAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/ApplyMemoryRealmAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/ApplyMemoryRealmAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/ApplyRealmsAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/ApplyRealmsAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/ApplyRealmsAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/ApplyRealmsAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/ApplyRoleMemoryRealmAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/ApplyRoleMemoryRealmAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/ApplyRoleMemoryRealmAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/ApplyRoleMemoryRealmAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/ApplyUserMemoryRealmAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/ApplyUserMemoryRealmAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/ApplyUserMemoryRealmAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/ApplyUserMemoryRealmAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/BaseMemoryRealmAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/BaseMemoryRealmAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/BaseMemoryRealmAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/BaseMemoryRealmAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/BaseSecurityAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/BaseSecurityAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/BaseSecurityAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/BaseSecurityAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/DatasourceRealmForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/DatasourceRealmForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/DatasourceRealmForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/DatasourceRealmForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/EditDatasourceRealmAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/EditDatasourceRealmAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/EditDatasourceRealmAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/EditDatasourceRealmAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/EditGroupMemoryRealmAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/EditGroupMemoryRealmAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/EditGroupMemoryRealmAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/EditGroupMemoryRealmAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/EditLdapRealmAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/EditLdapRealmAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/EditLdapRealmAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/EditLdapRealmAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/EditMemoryRealmAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/EditMemoryRealmAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/EditMemoryRealmAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/EditMemoryRealmAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/EditMemoryRealmGroupsAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/EditMemoryRealmGroupsAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/EditMemoryRealmGroupsAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/EditMemoryRealmGroupsAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/EditMemoryRealmRolesAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/EditMemoryRealmRolesAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/EditMemoryRealmRolesAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/EditMemoryRealmRolesAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/EditMemoryRealmUsersAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/EditMemoryRealmUsersAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/EditMemoryRealmUsersAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/EditMemoryRealmUsersAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/EditNewGroupMemoryRealmAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/EditNewGroupMemoryRealmAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/EditNewGroupMemoryRealmAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/EditNewGroupMemoryRealmAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/EditNewRoleMemoryRealmAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/EditNewRoleMemoryRealmAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/EditNewRoleMemoryRealmAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/EditNewRoleMemoryRealmAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/EditNewUserMemoryRealmAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/EditNewUserMemoryRealmAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/EditNewUserMemoryRealmAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/EditNewUserMemoryRealmAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/EditRoleMemoryRealmAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/EditRoleMemoryRealmAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/EditRoleMemoryRealmAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/EditRoleMemoryRealmAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/EditSecurityCatalinaRealmAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/EditSecurityCatalinaRealmAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/EditSecurityCatalinaRealmAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/EditSecurityCatalinaRealmAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/EditUserMemoryRealmAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/EditUserMemoryRealmAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/EditUserMemoryRealmAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/EditUserMemoryRealmAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/FactoryRealmForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/FactoryRealmForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/FactoryRealmForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/FactoryRealmForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/GroupMemoryRealmForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/GroupMemoryRealmForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/GroupMemoryRealmForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/GroupMemoryRealmForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/ItemsMemoryRealmForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/ItemsMemoryRealmForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/ItemsMemoryRealmForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/ItemsMemoryRealmForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/ItemsRealmsForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/ItemsRealmsForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/ItemsRealmsForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/ItemsRealmsForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/LdapRealmForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/LdapRealmForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/LdapRealmForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/LdapRealmForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/ListRealmsAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/ListRealmsAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/ListRealmsAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/ListRealmsAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/MemoryRealmForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/MemoryRealmForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/MemoryRealmForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/MemoryRealmForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/RealmItem.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/RealmItem.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/RealmItem.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/RealmItem.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/RealmItemByNameComparator.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/RealmItemByNameComparator.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/RealmItemByNameComparator.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/RealmItemByNameComparator.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/RoleMemoryRealmForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/RoleMemoryRealmForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/RoleMemoryRealmForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/RoleMemoryRealmForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/SaveRealmAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/SaveRealmAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/SaveRealmAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/SaveRealmAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/UserMemoryRealmForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/UserMemoryRealmForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/UserMemoryRealmForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/security/UserMemoryRealmForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/EditServiceSecurityAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/EditServiceSecurityAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/EditServiceSecurityAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/EditServiceSecurityAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/ListServicesAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/ListServicesAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/ListServicesAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/ListServicesAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/ModuleForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/ModuleForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/ModuleForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/ModuleForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/ServiceItem.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/ServiceItem.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/ServiceItem.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/ServiceItem.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/ServiceItemByNameComparator.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/ServiceItemByNameComparator.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/ServiceItemByNameComparator.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/ServiceItemByNameComparator.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/ApplyWebAppCatalinaAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/ApplyWebAppCatalinaAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/ApplyWebAppCatalinaAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/ApplyWebAppCatalinaAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/ApplyWebAppJettyAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/ApplyWebAppJettyAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/ApplyWebAppJettyAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/ApplyWebAppJettyAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/ApplyWebsConfirmAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/ApplyWebsConfirmAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/ApplyWebsConfirmAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/ApplyWebsConfirmAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/BaseWebAppAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/BaseWebAppAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/BaseWebAppAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/BaseWebAppAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/ContainerForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/ContainerForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/ContainerForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/ContainerForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/ContainerItem.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/ContainerItem.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/ContainerItem.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/ContainerItem.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/ContainerItemByFile.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/ContainerItemByFile.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/ContainerItemByFile.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/ContainerItemByFile.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/EarForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/EarForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/EarForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/EarForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/EditContainerAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/EditContainerAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/EditContainerAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/EditContainerAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/EditContainerStatisticAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/EditContainerStatisticAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/EditContainerStatisticAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/EditContainerStatisticAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/EditEarAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/EditEarAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/EditEarAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/EditEarAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/EditEjbCsStatisticAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/EditEjbCsStatisticAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/EditEjbCsStatisticAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/EditEjbCsStatisticAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/EditWarAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/EditWarAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/EditWarAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/EditWarAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/EditWebAppAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/EditWebAppAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/EditWebAppAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/EditWebAppAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/EditWebAppCatalinaAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/EditWebAppCatalinaAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/EditWebAppCatalinaAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/EditWebAppCatalinaAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/EditWebAppJettyAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/EditWebAppJettyAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/EditWebAppJettyAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/EditWebAppJettyAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/EjbContainersStatisticForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/EjbContainersStatisticForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/EjbContainersStatisticForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/EjbContainersStatisticForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/ListAppContainersAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/ListAppContainersAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/ListAppContainersAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/ListAppContainersAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/ListContainersAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/ListContainersAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/ListContainersAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/ListContainersAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/ListWebContainersAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/ListWebContainersAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/ListWebContainersAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/ListWebContainersAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/SelectedItemsForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/SelectedItemsForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/SelectedItemsForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/SelectedItemsForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/ViewContainerAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/ViewContainerAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/ViewContainerAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/ViewContainerAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/ViewContainerEjbsAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/ViewContainerEjbsAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/ViewContainerEjbsAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/ViewContainerEjbsAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/WarForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/WarForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/WarForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/WarForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/WebAppCatalinaForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/WebAppCatalinaForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/WebAppCatalinaForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/WebAppCatalinaForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/WebAppForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/WebAppForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/WebAppForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/WebAppForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/WebAppItem.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/WebAppItem.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/WebAppItem.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/WebAppItem.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/WebAppItemByPathContext.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/WebAppItemByPathContext.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/WebAppItemByPathContext.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/WebAppItemByPathContext.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/WebAppJettyForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/WebAppJettyForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/WebAppJettyForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/container/WebAppJettyForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/db/ApplyDatasourceAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/db/ApplyDatasourceAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/db/ApplyDatasourceAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/db/ApplyDatasourceAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/db/ApplyDatasourceStatAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/db/ApplyDatasourceStatAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/db/ApplyDatasourceStatAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/db/ApplyDatasourceStatAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/db/DatasourceForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/db/DatasourceForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/db/DatasourceForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/db/DatasourceForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/db/DatasourceItem.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/db/DatasourceItem.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/db/DatasourceItem.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/db/DatasourceItem.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/db/DatasourceItemByNameComparator.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/db/DatasourceItemByNameComparator.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/db/DatasourceItemByNameComparator.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/db/DatasourceItemByNameComparator.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/db/EditDatasourceAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/db/EditDatasourceAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/db/EditDatasourceAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/db/EditDatasourceAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/db/EditDatasourceStatAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/db/EditDatasourceStatAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/db/EditDatasourceStatAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/db/EditDatasourceStatAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/db/ListDatabasesAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/db/ListDatabasesAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/db/ListDatabasesAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/db/ListDatabasesAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/discovery/DiscoveryServiceForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/discovery/DiscoveryServiceForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/discovery/DiscoveryServiceForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/discovery/DiscoveryServiceForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/discovery/DiscoveryServiceStartMasterAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/discovery/DiscoveryServiceStartMasterAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/discovery/DiscoveryServiceStartMasterAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/discovery/DiscoveryServiceStartMasterAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/discovery/EditServiceDiscoveryAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/discovery/EditServiceDiscoveryAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/discovery/EditServiceDiscoveryAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/discovery/EditServiceDiscoveryAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/ejb/ApplyEjbSessionConfigurationAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/ejb/ApplyEjbSessionConfigurationAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/ejb/ApplyEjbSessionConfigurationAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/ejb/ApplyEjbSessionConfigurationAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/ejb/EditEjbAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/ejb/EditEjbAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/ejb/EditEjbAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/ejb/EditEjbAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/ejb/EditEjbEntityAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/ejb/EditEjbEntityAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/ejb/EditEjbEntityAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/ejb/EditEjbEntityAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/ejb/EditEjbMessageAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/ejb/EditEjbMessageAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/ejb/EditEjbMessageAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/ejb/EditEjbMessageAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/ejb/EditEjbSessionAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/ejb/EditEjbSessionAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/ejb/EditEjbSessionAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/ejb/EditEjbSessionAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/ejb/EditEjbSessionSblAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/ejb/EditEjbSessionSblAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/ejb/EditEjbSessionSblAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/ejb/EditEjbSessionSblAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/ejb/EjbDependency.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/ejb/EjbDependency.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/ejb/EjbDependency.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/ejb/EjbDependency.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/ejb/EjbEntityForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/ejb/EjbEntityForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/ejb/EjbEntityForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/ejb/EjbEntityForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/ejb/EjbForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/ejb/EjbForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/ejb/EjbForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/ejb/EjbForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/ejb/EjbItem.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/ejb/EjbItem.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/ejb/EjbItem.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/ejb/EjbItem.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/ejb/EjbItemByNameComparator.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/ejb/EjbItemByNameComparator.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/ejb/EjbItemByNameComparator.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/ejb/EjbItemByNameComparator.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/ejb/EjbMessageForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/ejb/EjbMessageForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/ejb/EjbMessageForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/ejb/EjbMessageForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/ejb/EjbSessionForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/ejb/EjbSessionForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/ejb/EjbSessionForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/ejb/EjbSessionForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/ejb/ExecuteEjbAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/ejb/ExecuteEjbAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/ejb/ExecuteEjbAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/ejb/ExecuteEjbAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jms/CfForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jms/CfForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jms/CfForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jms/CfForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jms/EditJmsServiceAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jms/EditJmsServiceAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jms/EditJmsServiceAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jms/EditJmsServiceAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jms/JmsServiceForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jms/JmsServiceForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jms/JmsServiceForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jms/JmsServiceForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jms/ListConnectionFactoriesAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jms/ListConnectionFactoriesAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jms/ListConnectionFactoriesAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jms/ListConnectionFactoriesAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jms/ListQueuesAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jms/ListQueuesAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jms/ListQueuesAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jms/ListQueuesAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jms/ListTopicsAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jms/ListTopicsAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jms/ListTopicsAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jms/ListTopicsAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jms/PresentConnectionFactoryAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jms/PresentConnectionFactoryAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jms/PresentConnectionFactoryAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jms/PresentConnectionFactoryAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jms/PresentQueueAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jms/PresentQueueAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jms/PresentQueueAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jms/PresentQueueAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jms/PresentTopicAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jms/PresentTopicAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jms/PresentTopicAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jms/PresentTopicAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jms/QueueForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jms/QueueForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jms/QueueForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jms/QueueForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jms/TopicForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jms/TopicForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jms/TopicForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jms/TopicForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jtm/ApplyConfirmXaResourceAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jtm/ApplyConfirmXaResourceAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jtm/ApplyConfirmXaResourceAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jtm/ApplyConfirmXaResourceAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jtm/ApplyJtmConfigurationAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jtm/ApplyJtmConfigurationAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jtm/ApplyJtmConfigurationAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jtm/ApplyJtmConfigurationAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jtm/EditJtmServiceAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jtm/EditJtmServiceAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jtm/EditJtmServiceAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jtm/EditJtmServiceAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jtm/EditTransactionMonitorAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jtm/EditTransactionMonitorAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jtm/EditTransactionMonitorAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jtm/EditTransactionMonitorAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jtm/EditTransactionRecoveryAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jtm/EditTransactionRecoveryAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jtm/EditTransactionRecoveryAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jtm/EditTransactionRecoveryAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jtm/EditTransactionStatisticAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jtm/EditTransactionStatisticAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jtm/EditTransactionStatisticAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jtm/EditTransactionStatisticAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jtm/ItemsXaResourceForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jtm/ItemsXaResourceForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jtm/ItemsXaResourceForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jtm/ItemsXaResourceForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jtm/JtmServiceForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jtm/JtmServiceForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jtm/JtmServiceForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jtm/JtmServiceForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jtm/JtmServiceMonitorForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jtm/JtmServiceMonitorForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jtm/JtmServiceMonitorForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jtm/JtmServiceMonitorForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jtm/JtmServiceRecoveryForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jtm/JtmServiceRecoveryForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jtm/JtmServiceRecoveryForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jtm/JtmServiceRecoveryForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jtm/JtmServiceStatisticForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jtm/JtmServiceStatisticForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jtm/JtmServiceStatisticForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jtm/JtmServiceStatisticForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jtm/JtmServiceXAResourceForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jtm/JtmServiceXAResourceForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jtm/JtmServiceXAResourceForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jtm/JtmServiceXAResourceForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jtm/ListXaResourceAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jtm/ListXaResourceAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jtm/ListXaResourceAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jtm/ListXaResourceAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jtm/ResetCountersAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jtm/ResetCountersAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jtm/ResetCountersAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jtm/ResetCountersAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jtm/ResetRecoveryAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jtm/ResetRecoveryAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jtm/ResetRecoveryAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jtm/ResetRecoveryAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jtm/ResetTransactionsAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jtm/ResetTransactionsAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jtm/ResetTransactionsAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jtm/ResetTransactionsAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jtm/TxItem.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jtm/TxItem.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jtm/TxItem.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jtm/TxItem.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jtm/TxRecovery.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jtm/TxRecovery.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jtm/TxRecovery.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jtm/TxRecovery.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jtm/TxXaresource.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jtm/TxXaresource.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jtm/TxXaresource.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/jtm/TxXaresource.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/mail/ApplyMimePartMailFactoryAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/mail/ApplyMimePartMailFactoryAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/mail/ApplyMimePartMailFactoryAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/mail/ApplyMimePartMailFactoryAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/mail/ApplySessionMailFactoryAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/mail/ApplySessionMailFactoryAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/mail/ApplySessionMailFactoryAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/mail/ApplySessionMailFactoryAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/mail/EditMailFactoryAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/mail/EditMailFactoryAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/mail/EditMailFactoryAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/mail/EditMailFactoryAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/mail/EditMailServiceAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/mail/EditMailServiceAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/mail/EditMailServiceAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/mail/EditMailServiceAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/mail/EditMimePartMailFactoryAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/mail/EditMimePartMailFactoryAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/mail/EditMimePartMailFactoryAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/mail/EditMimePartMailFactoryAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/mail/EditSessionMailFactoryAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/mail/EditSessionMailFactoryAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/mail/EditSessionMailFactoryAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/mail/EditSessionMailFactoryAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/mail/ListMimePartMailFactoriesAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/mail/ListMimePartMailFactoriesAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/mail/ListMimePartMailFactoriesAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/mail/ListMimePartMailFactoriesAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/mail/ListSessionMailFactoriesAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/mail/ListSessionMailFactoriesAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/mail/ListSessionMailFactoriesAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/mail/ListSessionMailFactoriesAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/mail/MailFactoryForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/mail/MailFactoryForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/mail/MailFactoryForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/mail/MailFactoryForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/mail/MailFactoryItem.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/mail/MailFactoryItem.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/mail/MailFactoryItem.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/mail/MailFactoryItem.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/mail/MailServiceForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/mail/MailServiceForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/mail/MailServiceForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/mail/MailServiceForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/resource/ApplyResourceAdapterAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/resource/ApplyResourceAdapterAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/resource/ApplyResourceAdapterAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/resource/ApplyResourceAdapterAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/resource/ApplyResourceAdapterCFAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/resource/ApplyResourceAdapterCFAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/resource/ApplyResourceAdapterCFAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/resource/ApplyResourceAdapterCFAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/resource/EditRarAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/resource/EditRarAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/resource/EditRarAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/resource/EditRarAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/resource/EditResourceAdapterAOAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/resource/EditResourceAdapterAOAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/resource/EditResourceAdapterAOAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/resource/EditResourceAdapterAOAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/resource/EditResourceAdapterASAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/resource/EditResourceAdapterASAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/resource/EditResourceAdapterASAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/resource/EditResourceAdapterASAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/resource/EditResourceAdapterAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/resource/EditResourceAdapterAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/resource/EditResourceAdapterAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/resource/EditResourceAdapterAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/resource/EditResourceAdapterCFAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/resource/EditResourceAdapterCFAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/resource/EditResourceAdapterCFAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/resource/EditResourceAdapterCFAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/resource/EditResourceAdapterCFStatAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/resource/EditResourceAdapterCFStatAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/resource/EditResourceAdapterCFStatAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/resource/EditResourceAdapterCFStatAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/resource/EditResourceAdapterStatAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/resource/EditResourceAdapterStatAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/resource/EditResourceAdapterStatAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/resource/EditResourceAdapterStatAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/resource/ListResourceAdaptersAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/resource/ListResourceAdaptersAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/resource/ListResourceAdaptersAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/resource/ListResourceAdaptersAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/resource/ResourceAdapterAOForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/resource/ResourceAdapterAOForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/resource/ResourceAdapterAOForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/resource/ResourceAdapterAOForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/resource/ResourceAdapterASForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/resource/ResourceAdapterASForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/resource/ResourceAdapterASForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/resource/ResourceAdapterASForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/resource/ResourceAdapterCFForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/resource/ResourceAdapterCFForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/resource/ResourceAdapterCFForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/resource/ResourceAdapterCFForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/resource/ResourceAdapterForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/resource/ResourceAdapterForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/resource/ResourceAdapterForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/resource/ResourceAdapterForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/resource/ResourceItem.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/resource/ResourceItem.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/resource/ResourceItem.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/resource/ResourceItem.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/resource/ResourceItemByFile.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/resource/ResourceItemByFile.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/resource/ResourceItemByFile.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/resource/ResourceItemByFile.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/webservice/HandlersDetailsAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/webservice/HandlersDetailsAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/webservice/HandlersDetailsAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/webservice/HandlersDetailsAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/webservice/ListWebServiceAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/webservice/ListWebServiceAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/webservice/ListWebServiceAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/webservice/ListWebServiceAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/webservice/PortComponentsDetailsAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/webservice/PortComponentsDetailsAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/webservice/PortComponentsDetailsAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/webservice/PortComponentsDetailsAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/webservice/ViewHandlersAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/webservice/ViewHandlersAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/webservice/ViewHandlersAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/webservice/ViewHandlersAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/webservice/ViewPortComponentsAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/webservice/ViewPortComponentsAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/webservice/ViewPortComponentsAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/webservice/ViewPortComponentsAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/webservice/WebServiceDetailsAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/webservice/WebServiceDetailsAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/webservice/WebServiceDetailsAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/service/webservice/WebServiceDetailsAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/TestFont.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/TestFont.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/TestFont.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/TestFont.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/TestNavigator.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/TestNavigator.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/TestNavigator.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/TestNavigator.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/begin.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/begin.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/begin.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/begin.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/blank.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/blank.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/blank.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/blank.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/catalina/connector.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/catalina/connector.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/catalina/connector.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/catalina/connector.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/catalina/connectors.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/catalina/connectors.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/catalina/connectors.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/catalina/connectors.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/catalina/connectorsConfirm.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/catalina/connectorsConfirm.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/catalina/connectorsConfirm.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/catalina/connectorsConfirm.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/common/begin.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/common/begin.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/common/begin.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/common/begin.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/common/end.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/common/end.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/common/end.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/common/end.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/deploy/deploy.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/deploy/deploy.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/deploy/deploy.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/deploy/deploy.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/deploy/deployConfirm.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/deploy/deployConfirm.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/deploy/deployConfirm.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/deploy/deployConfirm.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/deploy/domainDeploy.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/deploy/domainDeploy.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/deploy/domainDeploy.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/deploy/domainDeploy.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/deploy/domainDeployConfirm.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/deploy/domainDeployConfirm.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/deploy/domainDeployConfirm.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/deploy/domainDeployConfirm.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/deploy/domainDeployProgress.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/deploy/domainDeployProgress.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/deploy/domainDeployProgress.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/deploy/domainDeployProgress.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/deploy/domainUndeployConfirm.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/deploy/domainUndeployConfirm.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/deploy/domainUndeployConfirm.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/deploy/domainUndeployConfirm.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/deploy/remove.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/deploy/remove.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/deploy/remove.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/deploy/remove.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/deploy/removeConfirm.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/deploy/removeConfirm.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/deploy/removeConfirm.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/deploy/removeConfirm.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/deploy/upload.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/deploy/upload.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/deploy/upload.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/deploy/upload.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/deploy/uploadResult.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/deploy/uploadResult.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/deploy/uploadResult.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/deploy/uploadResult.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/domain/addCluster.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/domain/addCluster.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/domain/addCluster.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/domain/addCluster.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/domain/addServer.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/domain/addServer.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/domain/addServer.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/domain/addServer.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/domain/addServerCluster.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/domain/addServerCluster.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/domain/addServerCluster.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/domain/addServerCluster.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/domain/domain.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/domain/domain.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/domain/domain.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/domain/domain.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/domain/serversConfirm.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/domain/serversConfirm.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/domain/serversConfirm.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/domain/serversConfirm.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/domain/serversConfirmMove.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/domain/serversConfirmMove.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/domain/serversConfirmMove.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/domain/serversConfirmMove.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/end.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/end.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/end.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/end.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/error.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/error.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/error.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/error.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/framemain.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/framemain.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/framemain.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/framemain.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/frameright.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/frameright.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/frameright.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/frameright.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/globalerror.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/globalerror.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/globalerror.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/globalerror.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/dot.gif b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/dot.gif similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/dot.gif rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/dot.gif diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/dot1.gif b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/dot1.gif similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/dot1.gif rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/dot1.gif diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/dot5.gif b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/dot5.gif similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/dot5.gif rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/dot5.gif diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/BalJonasGreen.gif b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/BalJonasGreen.gif similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/BalJonasGreen.gif rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/BalJonasGreen.gif diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/BalJonasTree.gif b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/BalJonasTree.gif similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/BalJonasTree.gif rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/BalJonasTree.gif diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/Database.gif b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/Database.gif similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/Database.gif rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/Database.gif diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/Datasource.gif b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/Datasource.gif similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/Datasource.gif rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/Datasource.gif diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/FolderBalJonas.gif b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/FolderBalJonas.gif similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/FolderBalJonas.gif rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/FolderBalJonas.gif diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/JonasQuestion.gif b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/JonasQuestion.gif similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/JonasQuestion.gif rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/JonasQuestion.gif diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/bean.gif b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/bean.gif similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/bean.gif rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/bean.gif diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/connector.gif b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/connector.gif similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/connector.gif rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/connector.gif diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/connectors.gif b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/connectors.gif similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/connectors.gif rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/connectors.gif diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/deploy.gif b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/deploy.gif similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/deploy.gif rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/deploy.gif diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/deployDomainManage.gif b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/deployDomainManage.gif similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/deployDomainManage.gif rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/deployDomainManage.gif diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/deployDomain_ear.gif b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/deployDomain_ear.gif similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/deployDomain_ear.gif rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/deployDomain_ear.gif diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/deployDomain_jar.gif b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/deployDomain_jar.gif similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/deployDomain_jar.gif rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/deployDomain_jar.gif diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/deployDomain_rar.gif b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/deployDomain_rar.gif similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/deployDomain_rar.gif rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/deployDomain_rar.gif diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/deployDomain_war.gif b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/deployDomain_war.gif similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/deployDomain_war.gif rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/deployDomain_war.gif diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/deploy_datasource.gif b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/deploy_datasource.gif similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/deploy_datasource.gif rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/deploy_datasource.gif diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/deploy_ear.gif b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/deploy_ear.gif similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/deploy_ear.gif rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/deploy_ear.gif diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/deploy_jar.gif b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/deploy_jar.gif similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/deploy_jar.gif rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/deploy_jar.gif diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/deploy_rar.gif b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/deploy_rar.gif similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/deploy_rar.gif rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/deploy_rar.gif diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/deploy_war.gif b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/deploy_war.gif similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/deploy_war.gif rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/deploy_war.gif diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/deployed.gif b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/deployed.gif similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/deployed.gif rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/deployed.gif diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/deployed_not.gif b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/deployed_not.gif similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/deployed_not.gif rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/deployed_not.gif diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/domain_jonas.gif b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/domain_jonas.gif similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/domain_jonas.gif rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/domain_jonas.gif diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/ear.gif b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/ear.gif similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/ear.gif rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/ear.gif diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/jar.gif b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/jar.gif similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/jar.gif rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/jar.gif diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/jms.gif b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/jms.gif similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/jms.gif rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/jms.gif diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/jms_connector.gif b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/jms_connector.gif similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/jms_connector.gif rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/jms_connector.gif diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/jms_queue.gif b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/jms_queue.gif similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/jms_queue.gif rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/jms_queue.gif diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/jms_topic.gif b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/jms_topic.gif similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/jms_topic.gif rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/jms_topic.gif diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/logger_http.gif b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/logger_http.gif similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/logger_http.gif rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/logger_http.gif diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/logger_jonas.gif b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/logger_jonas.gif similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/logger_jonas.gif rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/logger_jonas.gif diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/loggers.gif b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/loggers.gif similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/loggers.gif rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/loggers.gif diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/mail.gif b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/mail.gif similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/mail.gif rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/mail.gif diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/mail_mime.gif b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/mail_mime.gif similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/mail_mime.gif rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/mail_mime.gif diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/mail_session.gif b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/mail_session.gif similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/mail_session.gif rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/mail_session.gif diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/mbean.gif b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/mbean.gif similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/mbean.gif rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/mbean.gif diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/mbeandomain.gif b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/mbeandomain.gif similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/mbeandomain.gif rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/mbeandomain.gif diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/mbeans.gif b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/mbeans.gif similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/mbeans.gif rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/mbeans.gif diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/mbeantype.gif b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/mbeantype.gif similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/mbeantype.gif rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/mbeantype.gif diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/monitoring.gif b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/monitoring.gif similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/monitoring.gif rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/monitoring.gif diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/protocol.gif b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/protocol.gif similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/protocol.gif rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/protocol.gif diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/resourceAdapter.gif b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/resourceAdapter.gif similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/resourceAdapter.gif rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/resourceAdapter.gif diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/resources.gif b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/resources.gif similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/resources.gif rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/resources.gif diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/security.gif b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/security.gif similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/security.gif rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/security.gif diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/security_database.gif b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/security_database.gif similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/security_database.gif rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/security_database.gif diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/security_ldap.gif b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/security_ldap.gif similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/security_ldap.gif rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/security_ldap.gif diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/security_memory.gif b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/security_memory.gif similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/security_memory.gif rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/security_memory.gif diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/service_application.gif b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/service_application.gif similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/service_application.gif rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/service_application.gif diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/service_database.gif b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/service_database.gif similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/service_database.gif rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/service_database.gif diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/service_ejb.gif b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/service_ejb.gif similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/service_ejb.gif rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/service_ejb.gif diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/service_jms.gif b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/service_jms.gif similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/service_jms.gif rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/service_jms.gif diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/service_mail.gif b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/service_mail.gif similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/service_mail.gif rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/service_mail.gif diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/service_resource.gif b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/service_resource.gif similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/service_resource.gif rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/service_resource.gif diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/service_security.gif b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/service_security.gif similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/service_security.gif rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/service_security.gif diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/service_transaction.gif b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/service_transaction.gif similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/service_transaction.gif rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/service_transaction.gif diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/service_web.gif b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/service_web.gif similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/service_web.gif rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/service_web.gif diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/services.gif b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/services.gif similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/services.gif rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/services.gif diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/tag_blue.gif b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/tag_blue.gif similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/tag_blue.gif rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/tag_blue.gif diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/tag_green.gif b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/tag_green.gif similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/tag_green.gif rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/tag_green.gif diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/war.gif b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/war.gif similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/war.gif rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/icon/war.gif diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/logo/BalJonas.jpg b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/logo/BalJonas.jpg similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/logo/BalJonas.jpg rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/logo/BalJonas.jpg diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/logo/JonasAdmin.jpg b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/logo/JonasAdmin.jpg similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/logo/JonasAdmin.jpg rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/logo/JonasAdmin.jpg diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/logo/JonasAdminSmall.jpg b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/logo/JonasAdminSmall.jpg similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/logo/JonasAdminSmall.jpg rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/logo/JonasAdminSmall.jpg diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/logo/JonasSadSmall_Orange.jpg b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/logo/JonasSadSmall_Orange.jpg similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/logo/JonasSadSmall_Orange.jpg rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/logo/JonasSadSmall_Orange.jpg diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/logo/JonasSmall.jpg b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/logo/JonasSmall.jpg similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/logo/JonasSmall.jpg rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/logo/JonasSmall.jpg diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/logo/JonasSmall_White.jpg b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/logo/JonasSmall_White.jpg similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/logo/JonasSmall_White.jpg rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/logo/JonasSmall_White.jpg diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/tree/line.gif b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/tree/line.gif similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/tree/line.gif rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/tree/line.gif diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/tree/line_first.gif b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/tree/line_first.gif similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/tree/line_first.gif rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/tree/line_first.gif diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/tree/line_last.gif b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/tree/line_last.gif similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/tree/line_last.gif rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/tree/line_last.gif diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/tree/line_middle.gif b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/tree/line_middle.gif similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/tree/line_middle.gif rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/tree/line_middle.gif diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/tree/node_close.gif b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/tree/node_close.gif similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/tree/node_close.gif rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/tree/node_close.gif diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/tree/node_close_first.gif b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/tree/node_close_first.gif similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/tree/node_close_first.gif rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/tree/node_close_first.gif diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/tree/node_close_last.gif b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/tree/node_close_last.gif similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/tree/node_close_last.gif rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/tree/node_close_last.gif diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/tree/node_close_middle.gif b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/tree/node_close_middle.gif similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/tree/node_close_middle.gif rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/tree/node_close_middle.gif diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/tree/node_open.gif b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/tree/node_open.gif similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/tree/node_open.gif rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/tree/node_open.gif diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/tree/node_open_first.gif b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/tree/node_open_first.gif similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/tree/node_open_first.gif rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/tree/node_open_first.gif diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/tree/node_open_last.gif b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/tree/node_open_last.gif similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/tree/node_open_last.gif rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/tree/node_open_last.gif diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/tree/node_open_middle.gif b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/tree/node_open_middle.gif similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/tree/node_open_middle.gif rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/tree/node_open_middle.gif diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/tree/noline.gif b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/tree/noline.gif similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/tree/noline.gif rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/images/tree/noline.gif diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/index.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/index.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/index.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/index.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/jonasserver/jmxserver.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/jonasserver/jmxserver.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/jonasserver/jmxserver.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/jonasserver/jmxserver.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/jonasserver/jonasserver.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/jonasserver/jonasserver.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/jonasserver/jonasserver.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/jonasserver/jonasserver.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/jonasserver/jonasversions.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/jonasserver/jonasversions.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/jonasserver/jonasversions.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/jonasserver/jonasversions.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/jonasserver/jvm.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/jonasserver/jvm.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/jonasserver/jvm.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/jonasserver/jvm.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/jonasserver/listRegistry.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/jonasserver/listRegistry.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/jonasserver/listRegistry.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/jonasserver/listRegistry.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/jonasserver/registry.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/jonasserver/registry.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/jonasserver/registry.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/jonasserver/registry.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/jonasserver/servletServer.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/jonasserver/servletServer.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/jonasserver/servletServer.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/jonasserver/servletServer.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/joramplatform/addreader.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/joramplatform/addreader.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/joramplatform/addreader.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/joramplatform/addreader.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/joramplatform/addwriter.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/joramplatform/addwriter.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/joramplatform/addwriter.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/joramplatform/addwriter.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/joramplatform/createdestination.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/joramplatform/createdestination.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/joramplatform/createdestination.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/joramplatform/createdestination.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/joramplatform/createuser.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/joramplatform/createuser.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/joramplatform/createuser.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/joramplatform/createuser.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/joramplatform/joramadapter.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/joramplatform/joramadapter.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/joramplatform/joramadapter.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/joramplatform/joramadapter.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/joramplatform/joramdestinations.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/joramplatform/joramdestinations.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/joramplatform/joramdestinations.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/joramplatform/joramdestinations.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/joramplatform/joramdeststatistics.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/joramplatform/joramdeststatistics.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/joramplatform/joramdeststatistics.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/joramplatform/joramdeststatistics.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/joramplatform/joramplatform.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/joramplatform/joramplatform.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/joramplatform/joramplatform.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/joramplatform/joramplatform.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/joramplatform/joramqueue.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/joramplatform/joramqueue.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/joramplatform/joramqueue.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/joramplatform/joramqueue.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/joramplatform/joramqueuereaders.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/joramplatform/joramqueuereaders.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/joramplatform/joramqueuereaders.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/joramplatform/joramqueuereaders.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/joramplatform/joramqueuewriters.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/joramplatform/joramqueuewriters.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/joramplatform/joramqueuewriters.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/joramplatform/joramqueuewriters.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/joramplatform/joramremotedestinations.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/joramplatform/joramremotedestinations.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/joramplatform/joramremotedestinations.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/joramplatform/joramremotedestinations.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/joramplatform/joramremoteserver.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/joramplatform/joramremoteserver.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/joramplatform/joramremoteserver.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/joramplatform/joramremoteserver.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/joramplatform/joramservers.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/joramplatform/joramservers.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/joramplatform/joramservers.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/joramplatform/joramservers.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/joramplatform/joramtopic.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/joramplatform/joramtopic.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/joramplatform/joramtopic.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/joramplatform/joramtopic.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/joramplatform/joramtopicreaders.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/joramplatform/joramtopicreaders.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/joramplatform/joramtopicreaders.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/joramplatform/joramtopicreaders.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/joramplatform/joramtopicwriters.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/joramplatform/joramtopicwriters.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/joramplatform/joramtopicwriters.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/joramplatform/joramtopicwriters.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/joramplatform/joramusers.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/joramplatform/joramusers.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/joramplatform/joramusers.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/joramplatform/joramusers.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/joramplatform/joramxml.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/joramplatform/joramxml.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/joramplatform/joramxml.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/joramplatform/joramxml.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/joramplatform/queueUsedBy.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/joramplatform/queueUsedBy.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/joramplatform/queueUsedBy.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/joramplatform/queueUsedBy.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/joramplatform/removeDestinationsConfirm.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/joramplatform/removeDestinationsConfirm.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/joramplatform/removeDestinationsConfirm.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/joramplatform/removeDestinationsConfirm.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/joramplatform/removeUsersConfirm.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/joramplatform/removeUsersConfirm.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/joramplatform/removeUsersConfirm.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/joramplatform/removeUsersConfirm.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/joramplatform/topicUsedBy.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/joramplatform/topicUsedBy.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/joramplatform/topicUsedBy.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/joramplatform/topicUsedBy.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/logging/catalinaAccessLogger.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/logging/catalinaAccessLogger.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/logging/catalinaAccessLogger.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/logging/catalinaAccessLogger.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/logging/loggers.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/logging/loggers.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/logging/loggers.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/logging/loggers.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/logging/loggersConfirm.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/logging/loggersConfirm.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/logging/loggersConfirm.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/logging/loggersConfirm.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/logging/loggingJonas.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/logging/loggingJonas.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/logging/loggingJonas.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/logging/loggingJonas.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/login.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/login.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/login.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/login.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/mbean/listJ2eeMBeans.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/mbean/listJ2eeMBeans.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/mbean/listJ2eeMBeans.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/mbean/listJ2eeMBeans.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/mbean/listMBeanAttributes.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/mbean/listMBeanAttributes.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/mbean/listMBeanAttributes.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/mbean/listMBeanAttributes.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/mbean/listMBeanOperations.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/mbean/listMBeanOperations.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/mbean/listMBeanOperations.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/mbean/listMBeanOperations.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/mbean/listMBeanProperties.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/mbean/listMBeanProperties.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/mbean/listMBeanProperties.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/mbean/listMBeanProperties.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/mbean/listMBeans.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/mbean/listMBeans.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/mbean/listMBeans.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/mbean/listMBeans.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/mbean/listOwnerMBeans.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/mbean/listOwnerMBeans.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/mbean/listOwnerMBeans.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/mbean/listOwnerMBeans.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/mbean/listUnknownMBeans.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/mbean/listUnknownMBeans.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/mbean/listUnknownMBeans.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/mbean/listUnknownMBeans.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/monitoring/cmiCluster.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/monitoring/cmiCluster.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/monitoring/cmiCluster.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/monitoring/cmiCluster.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/monitoring/cmiMember.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/monitoring/cmiMember.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/monitoring/cmiMember.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/monitoring/cmiMember.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/monitoring/daemonProxyCluster.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/monitoring/daemonProxyCluster.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/monitoring/daemonProxyCluster.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/monitoring/daemonProxyCluster.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/monitoring/daemonProxyMember.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/monitoring/daemonProxyMember.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/monitoring/daemonProxyMember.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/monitoring/daemonProxyMember.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/monitoring/displaynode.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/monitoring/displaynode.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/monitoring/displaynode.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/monitoring/displaynode.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/monitoring/ejbHaCluster.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/monitoring/ejbHaCluster.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/monitoring/ejbHaCluster.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/monitoring/ejbHaCluster.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/monitoring/ejbHaMember.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/monitoring/ejbHaMember.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/monitoring/ejbHaMember.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/monitoring/ejbHaMember.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/monitoring/jkCluster.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/monitoring/jkCluster.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/monitoring/jkCluster.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/monitoring/jkCluster.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/monitoring/jkMember.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/monitoring/jkMember.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/monitoring/jkMember.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/monitoring/jkMember.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/monitoring/joramCluster.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/monitoring/joramCluster.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/monitoring/joramCluster.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/monitoring/joramCluster.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/monitoring/joramMember.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/monitoring/joramMember.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/monitoring/joramMember.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/monitoring/joramMember.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/monitoring/logicalCluster.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/monitoring/logicalCluster.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/monitoring/logicalCluster.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/monitoring/logicalCluster.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/monitoring/logicalMember.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/monitoring/logicalMember.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/monitoring/logicalMember.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/monitoring/logicalMember.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/monitoring/memory.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/monitoring/memory.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/monitoring/memory.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/monitoring/memory.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/monitoring/monitoring.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/monitoring/monitoring.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/monitoring/monitoring.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/monitoring/monitoring.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/monitoring/tomcatCluster.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/monitoring/tomcatCluster.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/monitoring/tomcatCluster.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/monitoring/tomcatCluster.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/monitoring/tomcatMember.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/monitoring/tomcatMember.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/monitoring/tomcatMember.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/monitoring/tomcatMember.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/resource/createDestination.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/resource/createDestination.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/resource/createDestination.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/resource/createDestination.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/resource/datasourceProperties.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/resource/datasourceProperties.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/resource/datasourceProperties.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/resource/datasourceProperties.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/resource/datasources.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/resource/datasources.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/resource/datasources.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/resource/datasources.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/resource/deployDatasource.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/resource/deployDatasource.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/resource/deployDatasource.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/resource/deployDatasource.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/resource/deployMailFactory.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/resource/deployMailFactory.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/resource/deployMailFactory.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/resource/deployMailFactory.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/resource/destinationsConfirm.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/resource/destinationsConfirm.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/resource/destinationsConfirm.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/resource/destinationsConfirm.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/resource/jmsResources.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/resource/jmsResources.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/resource/jmsResources.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/resource/jmsResources.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/resource/mailFactories.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/resource/mailFactories.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/resource/mailFactories.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/resource/mailFactories.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/resource/mailFactoryProperties.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/resource/mailFactoryProperties.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/resource/mailFactoryProperties.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/resource/mailFactoryProperties.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/resource/mimePartFactoryProperties.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/resource/mimePartFactoryProperties.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/resource/mimePartFactoryProperties.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/resource/mimePartFactoryProperties.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/resource/sessionFactoryProperties.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/resource/sessionFactoryProperties.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/resource/sessionFactoryProperties.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/resource/sessionFactoryProperties.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/resourceadapter/createJDBCResourceAdapter.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/resourceadapter/createJDBCResourceAdapter.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/resourceadapter/createJDBCResourceAdapter.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/resourceadapter/createJDBCResourceAdapter.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/resourceadapter/createOtherResourceAdapter.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/resourceadapter/createOtherResourceAdapter.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/resourceadapter/createOtherResourceAdapter.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/resourceadapter/createOtherResourceAdapter.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/resourceadapter/createResourceAdapter.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/resourceadapter/createResourceAdapter.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/resourceadapter/createResourceAdapter.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/resourceadapter/createResourceAdapter.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/script/jonasAdmin.js b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/script/jonasAdmin.js similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/script/jonasAdmin.js rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/script/jonasAdmin.js diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/security/confirmActionMemoryRealm.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/security/confirmActionMemoryRealm.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/security/confirmActionMemoryRealm.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/security/confirmActionMemoryRealm.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/security/datasourceRealm.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/security/datasourceRealm.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/security/datasourceRealm.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/security/datasourceRealm.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/security/groupMemoryRealm.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/security/groupMemoryRealm.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/security/groupMemoryRealm.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/security/groupMemoryRealm.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/security/ldapRealm.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/security/ldapRealm.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/security/ldapRealm.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/security/ldapRealm.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/security/memoryRealm.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/security/memoryRealm.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/security/memoryRealm.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/security/memoryRealm.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/security/memoryRealmGroups.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/security/memoryRealmGroups.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/security/memoryRealmGroups.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/security/memoryRealmGroups.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/security/memoryRealmRoles.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/security/memoryRealmRoles.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/security/memoryRealmRoles.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/security/memoryRealmRoles.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/security/memoryRealmUsers.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/security/memoryRealmUsers.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/security/memoryRealmUsers.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/security/memoryRealmUsers.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/security/realms.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/security/realms.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/security/realms.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/security/realms.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/security/realmsConfirm.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/security/realmsConfirm.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/security/realmsConfirm.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/security/realmsConfirm.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/security/roleMemoryRealm.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/security/roleMemoryRealm.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/security/roleMemoryRealm.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/security/roleMemoryRealm.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/security/securityCatalinaRealm.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/security/securityCatalinaRealm.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/security/securityCatalinaRealm.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/security/securityCatalinaRealm.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/security/userMemoryRealm.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/security/userMemoryRealm.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/security/userMemoryRealm.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/security/userMemoryRealm.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/appContainers.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/appContainers.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/appContainers.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/appContainers.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/cfUsedBy.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/cfUsedBy.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/cfUsedBy.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/cfUsedBy.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/confirmActionXaResource.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/confirmActionXaResource.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/confirmActionXaResource.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/confirmActionXaResource.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/container.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/container.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/container.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/container.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/containerEjbs.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/containerEjbs.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/containerEjbs.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/containerEjbs.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/containerStatistic.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/containerStatistic.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/containerStatistic.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/containerStatistic.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/containers.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/containers.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/containers.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/containers.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/databases.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/databases.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/databases.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/databases.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/datasource.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/datasource.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/datasource.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/datasource.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/datasourceStatistics.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/datasourceStatistics.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/datasourceStatistics.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/datasourceStatistics.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/datasourceUsedBy.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/datasourceUsedBy.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/datasourceUsedBy.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/datasourceUsedBy.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/discovery.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/discovery.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/discovery.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/discovery.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/ear.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/ear.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/ear.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/ear.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/earJars.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/earJars.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/earJars.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/earJars.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/earRars.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/earRars.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/earRars.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/earRars.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/earWars.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/earWars.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/earWars.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/earWars.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/earXmlDeployment.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/earXmlDeployment.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/earXmlDeployment.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/earXmlDeployment.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/ejb.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/ejb.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/ejb.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/ejb.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/ejbContainerService.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/ejbContainerService.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/ejbContainerService.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/ejbContainerService.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/ejbContainersStatistic.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/ejbContainersStatistic.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/ejbContainersStatistic.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/ejbContainersStatistic.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/ejbDependency.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/ejbDependency.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/ejbDependency.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/ejbDependency.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/ejbEntity.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/ejbEntity.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/ejbEntity.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/ejbEntity.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/ejbMessage.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/ejbMessage.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/ejbMessage.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/ejbMessage.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/ejbSession.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/ejbSession.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/ejbSession.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/ejbSession.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/handlersDetails.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/handlersDetails.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/handlersDetails.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/handlersDetails.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/jmsConnFactories.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/jmsConnFactories.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/jmsConnFactories.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/jmsConnFactories.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/jmsConnFactory.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/jmsConnFactory.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/jmsConnFactory.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/jmsConnFactory.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/jmsDestinations.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/jmsDestinations.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/jmsDestinations.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/jmsDestinations.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/jmsQueue.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/jmsQueue.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/jmsQueue.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/jmsQueue.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/jmsQueues.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/jmsQueues.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/jmsQueues.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/jmsQueues.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/jmsService.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/jmsService.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/jmsService.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/jmsService.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/jmsTopic.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/jmsTopic.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/jmsTopic.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/jmsTopic.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/jmsTopics.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/jmsTopics.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/jmsTopics.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/jmsTopics.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/jtmService.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/jtmService.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/jtmService.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/jtmService.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/mailService.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/mailService.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/mailService.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/mailService.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/mimepartFactories.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/mimepartFactories.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/mimepartFactories.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/mimepartFactories.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/mimepartFactory.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/mimepartFactory.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/mimepartFactory.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/mimepartFactory.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/mimepartMailFactoryUsedBy.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/mimepartMailFactoryUsedBy.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/mimepartMailFactoryUsedBy.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/mimepartMailFactoryUsedBy.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/portComponentsDetails.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/portComponentsDetails.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/portComponentsDetails.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/portComponentsDetails.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/queueUsedBy.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/queueUsedBy.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/queueUsedBy.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/queueUsedBy.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/rar10.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/rar10.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/rar10.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/rar10.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/rar10Stats.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/rar10Stats.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/rar10Stats.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/rar10Stats.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/rar15.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/rar15.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/rar15.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/rar15.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/rar15AO.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/rar15AO.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/rar15AO.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/rar15AO.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/rar15AOs.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/rar15AOs.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/rar15AOs.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/rar15AOs.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/rar15AS.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/rar15AS.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/rar15AS.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/rar15AS.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/rar15ASs.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/rar15ASs.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/rar15ASs.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/rar15ASs.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/rar15CF.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/rar15CF.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/rar15CF.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/rar15CF.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/rar15CFStats.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/rar15CFStats.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/rar15CFStats.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/rar15CFStats.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/rar15CFs.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/rar15CFs.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/rar15CFs.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/rar15CFs.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/rarPoolStatistics.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/rarPoolStatistics.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/rarPoolStatistics.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/rarPoolStatistics.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/rarStatistics.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/rarStatistics.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/rarStatistics.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/rarStatistics.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/rarUsedBy10.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/rarUsedBy10.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/rarUsedBy10.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/rarUsedBy10.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/rarUsedBy15.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/rarUsedBy15.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/rarUsedBy15.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/rarUsedBy15.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/rars.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/rars.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/rars.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/rars.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/security.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/security.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/security.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/security.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/services.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/services.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/services.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/services.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/sessionFactories.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/sessionFactories.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/sessionFactories.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/sessionFactories.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/sessionFactory.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/sessionFactory.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/sessionFactory.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/sessionFactory.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/sessionMailFactoryUsedBy.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/sessionMailFactoryUsedBy.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/sessionMailFactoryUsedBy.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/sessionMailFactoryUsedBy.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/topicUsedBy.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/topicUsedBy.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/topicUsedBy.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/topicUsedBy.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/transactionMonitor.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/transactionMonitor.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/transactionMonitor.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/transactionMonitor.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/transactionRecovery.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/transactionRecovery.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/transactionRecovery.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/transactionRecovery.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/transactionStatistic.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/transactionStatistic.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/transactionStatistic.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/transactionStatistic.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/viewHandlers.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/viewHandlers.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/viewHandlers.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/viewHandlers.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/viewPortComponents.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/viewPortComponents.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/viewPortComponents.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/viewPortComponents.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/war.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/war.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/war.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/war.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/warJonasXml.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/warJonasXml.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/warJonasXml.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/warJonasXml.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/warServlets.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/warServlets.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/warServlets.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/warServlets.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/warWebXml.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/warWebXml.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/warWebXml.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/warWebXml.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/webApp.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/webApp.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/webApp.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/webApp.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/webAppCatalina.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/webAppCatalina.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/webAppCatalina.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/webAppCatalina.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/webAppJetty.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/webAppJetty.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/webAppJetty.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/webAppJetty.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/webContainers.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/webContainers.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/webContainers.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/webContainers.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/webserviceDescriptions.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/webserviceDescriptions.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/webserviceDescriptions.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/webserviceDescriptions.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/webserviceDetails.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/webserviceDetails.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/webserviceDetails.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/webserviceDetails.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/xaresourceRecovery.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/xaresourceRecovery.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/xaresourceRecovery.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/service/xaresourceRecovery.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/style/jonasAdmin.css b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/style/jonasAdmin.css similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/style/jonasAdmin.css rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/style/jonasAdmin.css diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/top.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/top.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/top.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/top.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/tree.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/tree.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/tree.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/tree.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/welcomeContent.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/welcomeContent.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/welcomeContent.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/welcomeContent.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/xml/archiveConfig.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/xml/archiveConfig.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/xml/archiveConfig.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/xml/archiveConfig.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/xml/archiveConfigAdvanced.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/xml/archiveConfigAdvanced.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/xml/archiveConfigAdvanced.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/xml/archiveConfigAdvanced.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/xml/archiveConfigAjax.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/xml/archiveConfigAjax.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/xml/archiveConfigAjax.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/xml/archiveConfigAjax.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/xml/archiveConfigConfirm.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/xml/archiveConfigConfirm.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/xml/archiveConfigConfirm.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/xml/archiveConfigConfirm.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/xml/archiveConfigSelect.jsp b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/xml/archiveConfigSelect.jsp similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/xml/archiveConfigSelect.jsp rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/web/xml/archiveConfigSelect.jsp diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/xml/ApplyArchiveConfigAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/xml/ApplyArchiveConfigAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/xml/ApplyArchiveConfigAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/xml/ApplyArchiveConfigAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/xml/ArchiveConfigAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/xml/ArchiveConfigAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/xml/ArchiveConfigAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/xml/ArchiveConfigAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/xml/ArchiveConfigAdvancedAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/xml/ArchiveConfigAdvancedAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/xml/ArchiveConfigAdvancedAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/xml/ArchiveConfigAdvancedAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/xml/ArchiveConfigForm.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/xml/ArchiveConfigForm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/xml/ArchiveConfigForm.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/xml/ArchiveConfigForm.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/xml/ArchiveConfigSelectAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/xml/ArchiveConfigSelectAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/xml/ArchiveConfigSelectAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/xml/ArchiveConfigSelectAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/xml/ArchiveUtilAction.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/xml/ArchiveUtilAction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/xml/ArchiveUtilAction.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/xml/ArchiveUtilAction.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/xml/XMLToFormUtil.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/xml/XMLToFormUtil.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/xml/XMLToFormUtil.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/xml/XMLToFormUtil.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/xml/XMLUtil.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/xml/XMLUtil.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/xml/XMLUtil.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/xml/XMLUtil.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/xml/xs/AttributeRestrictions.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/xml/xs/AttributeRestrictions.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/xml/xs/AttributeRestrictions.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/xml/xs/AttributeRestrictions.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/xml/xs/ElementRestrictions.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/xml/xs/ElementRestrictions.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/xml/xs/ElementRestrictions.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/xml/xs/ElementRestrictions.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/xml/xs/SchemaRestrictions.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/xml/xs/SchemaRestrictions.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/xml/xs/SchemaRestrictions.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/xml/xs/SchemaRestrictions.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/xml/xs/SchemaRestrictionsFactory.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/xml/xs/SchemaRestrictionsFactory.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/xml/xs/SchemaRestrictionsFactory.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/xml/xs/SchemaRestrictionsFactory.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/xml/xs/hardcoded/HCAttributeRestrictions.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/xml/xs/hardcoded/HCAttributeRestrictions.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/xml/xs/hardcoded/HCAttributeRestrictions.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/xml/xs/hardcoded/HCAttributeRestrictions.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/xml/xs/hardcoded/HCElementRestrictions.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/xml/xs/hardcoded/HCElementRestrictions.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/xml/xs/hardcoded/HCElementRestrictions.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/xml/xs/hardcoded/HCElementRestrictions.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/xml/xs/hardcoded/HCSchemaRestrictions.java b/jonas/src/org/objectweb/jonas/webapp/jonasadmin/xml/xs/hardcoded/HCSchemaRestrictions.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/jonasadmin/xml/xs/hardcoded/HCSchemaRestrictions.java rename to jonas/src/org/objectweb/jonas/webapp/jonasadmin/xml/xs/hardcoded/HCSchemaRestrictions.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/packages/jetty-doc-web.xml b/jonas/src/org/objectweb/jonas/webapp/packages/jetty-doc-web.xml similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/packages/jetty-doc-web.xml rename to jonas/src/org/objectweb/jonas/webapp/packages/jetty-doc-web.xml diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/packages/jonas-doc-manifest.mf b/jonas/src/org/objectweb/jonas/webapp/packages/jonas-doc-manifest.mf similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/packages/jonas-doc-manifest.mf rename to jonas/src/org/objectweb/jonas/webapp/packages/jonas-doc-manifest.mf diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/packages/jonas-javadoc-web.xml b/jonas/src/org/objectweb/jonas/webapp/packages/jonas-javadoc-web.xml similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/packages/jonas-javadoc-web.xml rename to jonas/src/org/objectweb/jonas/webapp/packages/jonas-javadoc-web.xml diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/taglib/GridBaseTag.java b/jonas/src/org/objectweb/jonas/webapp/taglib/GridBaseTag.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/taglib/GridBaseTag.java rename to jonas/src/org/objectweb/jonas/webapp/taglib/GridBaseTag.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/taglib/GridColTag.java b/jonas/src/org/objectweb/jonas/webapp/taglib/GridColTag.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/taglib/GridColTag.java rename to jonas/src/org/objectweb/jonas/webapp/taglib/GridColTag.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/taglib/GridRowTag.java b/jonas/src/org/objectweb/jonas/webapp/taglib/GridRowTag.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/taglib/GridRowTag.java rename to jonas/src/org/objectweb/jonas/webapp/taglib/GridRowTag.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/taglib/GridTableBaseTag.java b/jonas/src/org/objectweb/jonas/webapp/taglib/GridTableBaseTag.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/taglib/GridTableBaseTag.java rename to jonas/src/org/objectweb/jonas/webapp/taglib/GridTableBaseTag.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/taglib/GridTag.java b/jonas/src/org/objectweb/jonas/webapp/taglib/GridTag.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/taglib/GridTag.java rename to jonas/src/org/objectweb/jonas/webapp/taglib/GridTag.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/taglib/JonasButtonTag.java b/jonas/src/org/objectweb/jonas/webapp/taglib/JonasButtonTag.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/taglib/JonasButtonTag.java rename to jonas/src/org/objectweb/jonas/webapp/taglib/JonasButtonTag.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/taglib/JonasGridColTitleTag.java b/jonas/src/org/objectweb/jonas/webapp/taglib/JonasGridColTitleTag.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/taglib/JonasGridColTitleTag.java rename to jonas/src/org/objectweb/jonas/webapp/taglib/JonasGridColTitleTag.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/taglib/JonasGridNameTag.java b/jonas/src/org/objectweb/jonas/webapp/taglib/JonasGridNameTag.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/taglib/JonasGridNameTag.java rename to jonas/src/org/objectweb/jonas/webapp/taglib/JonasGridNameTag.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/taglib/JonasGridNameTitleTag.java b/jonas/src/org/objectweb/jonas/webapp/taglib/JonasGridNameTitleTag.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/taglib/JonasGridNameTitleTag.java rename to jonas/src/org/objectweb/jonas/webapp/taglib/JonasGridNameTitleTag.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/taglib/JonasGridRowTitleTag.java b/jonas/src/org/objectweb/jonas/webapp/taglib/JonasGridRowTitleTag.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/taglib/JonasGridRowTitleTag.java rename to jonas/src/org/objectweb/jonas/webapp/taglib/JonasGridRowTitleTag.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/taglib/JonasGridTag.java b/jonas/src/org/objectweb/jonas/webapp/taglib/JonasGridTag.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/taglib/JonasGridTag.java rename to jonas/src/org/objectweb/jonas/webapp/taglib/JonasGridTag.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/taglib/JonasGridValueTag.java b/jonas/src/org/objectweb/jonas/webapp/taglib/JonasGridValueTag.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/taglib/JonasGridValueTag.java rename to jonas/src/org/objectweb/jonas/webapp/taglib/JonasGridValueTag.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/taglib/JonasGridValueTitleTag.java b/jonas/src/org/objectweb/jonas/webapp/taglib/JonasGridValueTitleTag.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/taglib/JonasGridValueTitleTag.java rename to jonas/src/org/objectweb/jonas/webapp/taglib/JonasGridValueTitleTag.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/taglib/JonasSubmitTag.java b/jonas/src/org/objectweb/jonas/webapp/taglib/JonasSubmitTag.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/taglib/JonasSubmitTag.java rename to jonas/src/org/objectweb/jonas/webapp/taglib/JonasSubmitTag.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/taglib/LabelValueBean.java b/jonas/src/org/objectweb/jonas/webapp/taglib/LabelValueBean.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/taglib/LabelValueBean.java rename to jonas/src/org/objectweb/jonas/webapp/taglib/LabelValueBean.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/taglib/PanelSeparatorTag.java b/jonas/src/org/objectweb/jonas/webapp/taglib/PanelSeparatorTag.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/taglib/PanelSeparatorTag.java rename to jonas/src/org/objectweb/jonas/webapp/taglib/PanelSeparatorTag.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/taglib/PanelTag.java b/jonas/src/org/objectweb/jonas/webapp/taglib/PanelTag.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/taglib/PanelTag.java rename to jonas/src/org/objectweb/jonas/webapp/taglib/PanelTag.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/taglib/RefreshTreeTag.java b/jonas/src/org/objectweb/jonas/webapp/taglib/RefreshTreeTag.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/taglib/RefreshTreeTag.java rename to jonas/src/org/objectweb/jonas/webapp/taglib/RefreshTreeTag.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/taglib/TabTag.java b/jonas/src/org/objectweb/jonas/webapp/taglib/TabTag.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/taglib/TabTag.java rename to jonas/src/org/objectweb/jonas/webapp/taglib/TabTag.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/taglib/TabsTag.java b/jonas/src/org/objectweb/jonas/webapp/taglib/TabsTag.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/taglib/TabsTag.java rename to jonas/src/org/objectweb/jonas/webapp/taglib/TabsTag.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/taglib/TitleContentTag.java b/jonas/src/org/objectweb/jonas/webapp/taglib/TitleContentTag.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/taglib/TitleContentTag.java rename to jonas/src/org/objectweb/jonas/webapp/taglib/TitleContentTag.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/taglib/TreeBuilder.java b/jonas/src/org/objectweb/jonas/webapp/taglib/TreeBuilder.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/taglib/TreeBuilder.java rename to jonas/src/org/objectweb/jonas/webapp/taglib/TreeBuilder.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/taglib/TreeControl.java b/jonas/src/org/objectweb/jonas/webapp/taglib/TreeControl.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/taglib/TreeControl.java rename to jonas/src/org/objectweb/jonas/webapp/taglib/TreeControl.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/taglib/TreeControlNode.java b/jonas/src/org/objectweb/jonas/webapp/taglib/TreeControlNode.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/taglib/TreeControlNode.java rename to jonas/src/org/objectweb/jonas/webapp/taglib/TreeControlNode.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/taglib/TreeControlRenderTag.java b/jonas/src/org/objectweb/jonas/webapp/taglib/TreeControlRenderTag.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/taglib/TreeControlRenderTag.java rename to jonas/src/org/objectweb/jonas/webapp/taglib/TreeControlRenderTag.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/taglib/TreeControlTag.java b/jonas/src/org/objectweb/jonas/webapp/taglib/TreeControlTag.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/taglib/TreeControlTag.java rename to jonas/src/org/objectweb/jonas/webapp/taglib/TreeControlTag.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/taglib/WhereAreYouTag.java b/jonas/src/org/objectweb/jonas/webapp/taglib/WhereAreYouTag.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/taglib/WhereAreYouTag.java rename to jonas/src/org/objectweb/jonas/webapp/taglib/WhereAreYouTag.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/taglib/XMLEditorTag.java b/jonas/src/org/objectweb/jonas/webapp/taglib/XMLEditorTag.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/taglib/XMLEditorTag.java rename to jonas/src/org/objectweb/jonas/webapp/taglib/XMLEditorTag.java diff --git a/jonas/jonas/src/org/objectweb/jonas/webapp/taglib/XmlFileTag.java b/jonas/src/org/objectweb/jonas/webapp/taglib/XmlFileTag.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/webapp/taglib/XmlFileTag.java rename to jonas/src/org/objectweb/jonas/webapp/taglib/XmlFileTag.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ws/AbsWebServicesServiceImpl.java b/jonas/src/org/objectweb/jonas/ws/AbsWebServicesServiceImpl.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ws/AbsWebServicesServiceImpl.java rename to jonas/src/org/objectweb/jonas/ws/AbsWebServicesServiceImpl.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ws/AbsWebServicesServiceImplMBean.java b/jonas/src/org/objectweb/jonas/ws/AbsWebServicesServiceImplMBean.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ws/AbsWebServicesServiceImplMBean.java rename to jonas/src/org/objectweb/jonas/ws/AbsWebServicesServiceImplMBean.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ws/ClientJServiceFactoryFinder.java b/jonas/src/org/objectweb/jonas/ws/ClientJServiceFactoryFinder.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ws/ClientJServiceFactoryFinder.java rename to jonas/src/org/objectweb/jonas/ws/ClientJServiceFactoryFinder.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ws/I18n.properties b/jonas/src/org/objectweb/jonas/ws/I18n.properties similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ws/I18n.properties rename to jonas/src/org/objectweb/jonas/ws/I18n.properties diff --git a/jonas/jonas/src/org/objectweb/jonas/ws/JDefinitionWriter.java b/jonas/src/org/objectweb/jonas/ws/JDefinitionWriter.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ws/JDefinitionWriter.java rename to jonas/src/org/objectweb/jonas/ws/JDefinitionWriter.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ws/JServiceFactory.java b/jonas/src/org/objectweb/jonas/ws/JServiceFactory.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ws/JServiceFactory.java rename to jonas/src/org/objectweb/jonas/ws/JServiceFactory.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ws/JServiceFactoryFinder.java b/jonas/src/org/objectweb/jonas/ws/JServiceFactoryFinder.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ws/JServiceFactoryFinder.java rename to jonas/src/org/objectweb/jonas/ws/JServiceFactoryFinder.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ws/WSDLManager.java b/jonas/src/org/objectweb/jonas/ws/WSDLManager.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ws/WSDLManager.java rename to jonas/src/org/objectweb/jonas/ws/WSDLManager.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ws/WSServiceException.java b/jonas/src/org/objectweb/jonas/ws/WSServiceException.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ws/WSServiceException.java rename to jonas/src/org/objectweb/jonas/ws/WSServiceException.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ws/WebServicesService.java b/jonas/src/org/objectweb/jonas/ws/WebServicesService.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ws/WebServicesService.java rename to jonas/src/org/objectweb/jonas/ws/WebServicesService.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ws/axis/AxisWSServiceImpl.java b/jonas/src/org/objectweb/jonas/ws/axis/AxisWSServiceImpl.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ws/axis/AxisWSServiceImpl.java rename to jonas/src/org/objectweb/jonas/ws/axis/AxisWSServiceImpl.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ws/axis/I18n.properties b/jonas/src/org/objectweb/jonas/ws/axis/I18n.properties similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ws/axis/I18n.properties rename to jonas/src/org/objectweb/jonas/ws/axis/I18n.properties diff --git a/jonas/jonas/src/org/objectweb/jonas/ws/axis/JAxisServiceFactory.java b/jonas/src/org/objectweb/jonas/ws/axis/JAxisServiceFactory.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ws/axis/JAxisServiceFactory.java rename to jonas/src/org/objectweb/jonas/ws/axis/JAxisServiceFactory.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ws/axis/JAxisServlet.java b/jonas/src/org/objectweb/jonas/ws/axis/JAxisServlet.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ws/axis/JAxisServlet.java rename to jonas/src/org/objectweb/jonas/ws/axis/JAxisServlet.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ws/axis/JCall.java b/jonas/src/org/objectweb/jonas/ws/axis/JCall.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ws/axis/JCall.java rename to jonas/src/org/objectweb/jonas/ws/axis/JCall.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ws/axis/JOnASEJBProvider.java b/jonas/src/org/objectweb/jonas/ws/axis/JOnASEJBProvider.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ws/axis/JOnASEJBProvider.java rename to jonas/src/org/objectweb/jonas/ws/axis/JOnASEJBProvider.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ws/axis/JService.java b/jonas/src/org/objectweb/jonas/ws/axis/JService.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ws/axis/JService.java rename to jonas/src/org/objectweb/jonas/ws/axis/JService.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ws/axis/JServiceProxy.java b/jonas/src/org/objectweb/jonas/ws/axis/JServiceProxy.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ws/axis/JServiceProxy.java rename to jonas/src/org/objectweb/jonas/ws/axis/JServiceProxy.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ws/axis/JServletEngineConfigurationFactory.java b/jonas/src/org/objectweb/jonas/ws/axis/JServletEngineConfigurationFactory.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ws/axis/JServletEngineConfigurationFactory.java rename to jonas/src/org/objectweb/jonas/ws/axis/JServletEngineConfigurationFactory.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ws/axis/JonasHandler.java b/jonas/src/org/objectweb/jonas/ws/axis/JonasHandler.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ws/axis/JonasHandler.java rename to jonas/src/org/objectweb/jonas/ws/axis/JonasHandler.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ws/axis/NoopProvider.java b/jonas/src/org/objectweb/jonas/ws/axis/NoopProvider.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ws/axis/NoopProvider.java rename to jonas/src/org/objectweb/jonas/ws/axis/NoopProvider.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ws/axis/QSUpdateServiceWSDLHandler.java b/jonas/src/org/objectweb/jonas/ws/axis/QSUpdateServiceWSDLHandler.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ws/axis/QSUpdateServiceWSDLHandler.java rename to jonas/src/org/objectweb/jonas/ws/axis/QSUpdateServiceWSDLHandler.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ws/axis/URLMapper.java b/jonas/src/org/objectweb/jonas/ws/axis/URLMapper.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ws/axis/URLMapper.java rename to jonas/src/org/objectweb/jonas/ws/axis/URLMapper.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ws/axis/WSDDJOnASEJBProvider.java b/jonas/src/org/objectweb/jonas/ws/axis/WSDDJOnASEJBProvider.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ws/axis/WSDDJOnASEJBProvider.java rename to jonas/src/org/objectweb/jonas/ws/axis/WSDDJOnASEJBProvider.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ws/axis/WSDDNoopProvider.java b/jonas/src/org/objectweb/jonas/ws/axis/WSDDNoopProvider.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ws/axis/WSDDNoopProvider.java rename to jonas/src/org/objectweb/jonas/ws/axis/WSDDNoopProvider.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ws/axis/client-config.wsdd b/jonas/src/org/objectweb/jonas/ws/axis/client-config.wsdd similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ws/axis/client-config.wsdd rename to jonas/src/org/objectweb/jonas/ws/axis/client-config.wsdd diff --git a/jonas/jonas/src/org/objectweb/jonas/ws/axis/server-config.wsdd b/jonas/src/org/objectweb/jonas/ws/axis/server-config.wsdd similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ws/axis/server-config.wsdd rename to jonas/src/org/objectweb/jonas/ws/axis/server-config.wsdd diff --git a/jonas/jonas/src/org/objectweb/jonas/ws/handler/FileWSDLHandler.java b/jonas/src/org/objectweb/jonas/ws/handler/FileWSDLHandler.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ws/handler/FileWSDLHandler.java rename to jonas/src/org/objectweb/jonas/ws/handler/FileWSDLHandler.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ws/handler/I18n.properties b/jonas/src/org/objectweb/jonas/ws/handler/I18n.properties similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ws/handler/I18n.properties rename to jonas/src/org/objectweb/jonas/ws/handler/I18n.properties diff --git a/jonas/jonas/src/org/objectweb/jonas/ws/handler/RegistryWSDLHandler.java b/jonas/src/org/objectweb/jonas/ws/handler/RegistryWSDLHandler.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ws/handler/RegistryWSDLHandler.java rename to jonas/src/org/objectweb/jonas/ws/handler/RegistryWSDLHandler.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ws/handler/WSDLHandler.java b/jonas/src/org/objectweb/jonas/ws/handler/WSDLHandler.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ws/handler/WSDLHandler.java rename to jonas/src/org/objectweb/jonas/ws/handler/WSDLHandler.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ws/handler/WSDLHandlerFactory.java b/jonas/src/org/objectweb/jonas/ws/handler/WSDLHandlerFactory.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ws/handler/WSDLHandlerFactory.java rename to jonas/src/org/objectweb/jonas/ws/handler/WSDLHandlerFactory.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ws/mbean/AbstractWebServiceMBean.java b/jonas/src/org/objectweb/jonas/ws/mbean/AbstractWebServiceMBean.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ws/mbean/AbstractWebServiceMBean.java rename to jonas/src/org/objectweb/jonas/ws/mbean/AbstractWebServiceMBean.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ws/mbean/Handler.java b/jonas/src/org/objectweb/jonas/ws/mbean/Handler.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ws/mbean/Handler.java rename to jonas/src/org/objectweb/jonas/ws/mbean/Handler.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ws/mbean/PortComponent.java b/jonas/src/org/objectweb/jonas/ws/mbean/PortComponent.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ws/mbean/PortComponent.java rename to jonas/src/org/objectweb/jonas/ws/mbean/PortComponent.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ws/mbean/Service.java b/jonas/src/org/objectweb/jonas/ws/mbean/Service.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ws/mbean/Service.java rename to jonas/src/org/objectweb/jonas/ws/mbean/Service.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ws/mbean/WebServicesObjectName.java b/jonas/src/org/objectweb/jonas/ws/mbean/WebServicesObjectName.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ws/mbean/WebServicesObjectName.java rename to jonas/src/org/objectweb/jonas/ws/mbean/WebServicesObjectName.java diff --git a/jonas/jonas/src/org/objectweb/jonas/ws/mbean/mbeans-descriptors.xml b/jonas/src/org/objectweb/jonas/ws/mbean/mbeans-descriptors.xml similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas/ws/mbean/mbeans-descriptors.xml rename to jonas/src/org/objectweb/jonas/ws/mbean/mbeans-descriptors.xml diff --git a/jonas/jonas/src/org/objectweb/jonas_client/deployment/api/AppClientDTDs.java b/jonas/src/org/objectweb/jonas_client/deployment/api/AppClientDTDs.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_client/deployment/api/AppClientDTDs.java rename to jonas/src/org/objectweb/jonas_client/deployment/api/AppClientDTDs.java diff --git a/jonas/jonas/src/org/objectweb/jonas_client/deployment/api/AppClientSchemas.java b/jonas/src/org/objectweb/jonas_client/deployment/api/AppClientSchemas.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_client/deployment/api/AppClientSchemas.java rename to jonas/src/org/objectweb/jonas_client/deployment/api/AppClientSchemas.java diff --git a/jonas/jonas/src/org/objectweb/jonas_client/deployment/api/ClientContainerDeploymentDesc.java b/jonas/src/org/objectweb/jonas_client/deployment/api/ClientContainerDeploymentDesc.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_client/deployment/api/ClientContainerDeploymentDesc.java rename to jonas/src/org/objectweb/jonas_client/deployment/api/ClientContainerDeploymentDesc.java diff --git a/jonas/jonas/src/org/objectweb/jonas_client/deployment/api/ClientContainerDeploymentDescException.java b/jonas/src/org/objectweb/jonas_client/deployment/api/ClientContainerDeploymentDescException.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_client/deployment/api/ClientContainerDeploymentDescException.java rename to jonas/src/org/objectweb/jonas_client/deployment/api/ClientContainerDeploymentDescException.java diff --git a/jonas/jonas/src/org/objectweb/jonas_client/deployment/api/JonasAppClientDTDs.java b/jonas/src/org/objectweb/jonas_client/deployment/api/JonasAppClientDTDs.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_client/deployment/api/JonasAppClientDTDs.java rename to jonas/src/org/objectweb/jonas_client/deployment/api/JonasAppClientDTDs.java diff --git a/jonas/jonas/src/org/objectweb/jonas_client/deployment/api/JonasAppClientSchemas.java b/jonas/src/org/objectweb/jonas_client/deployment/api/JonasAppClientSchemas.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_client/deployment/api/JonasAppClientSchemas.java rename to jonas/src/org/objectweb/jonas_client/deployment/api/JonasAppClientSchemas.java diff --git a/jonas/jonas/src/org/objectweb/jonas_client/deployment/application-client_1_2.dtd b/jonas/src/org/objectweb/jonas_client/deployment/application-client_1_2.dtd similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_client/deployment/application-client_1_2.dtd rename to jonas/src/org/objectweb/jonas_client/deployment/application-client_1_2.dtd diff --git a/jonas/jonas/src/org/objectweb/jonas_client/deployment/application-client_1_3.dtd b/jonas/src/org/objectweb/jonas_client/deployment/application-client_1_3.dtd similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_client/deployment/application-client_1_3.dtd rename to jonas/src/org/objectweb/jonas_client/deployment/application-client_1_3.dtd diff --git a/jonas/jonas/src/org/objectweb/jonas_client/deployment/application-client_1_4.xsd b/jonas/src/org/objectweb/jonas_client/deployment/application-client_1_4.xsd similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_client/deployment/application-client_1_4.xsd rename to jonas/src/org/objectweb/jonas_client/deployment/application-client_1_4.xsd diff --git a/jonas/jonas/src/org/objectweb/jonas_client/deployment/jonas-client_3_2.dtd b/jonas/src/org/objectweb/jonas_client/deployment/jonas-client_3_2.dtd similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_client/deployment/jonas-client_3_2.dtd rename to jonas/src/org/objectweb/jonas_client/deployment/jonas-client_3_2.dtd diff --git a/jonas/jonas/src/org/objectweb/jonas_client/deployment/jonas-client_4_0.xsd b/jonas/src/org/objectweb/jonas_client/deployment/jonas-client_4_0.xsd similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_client/deployment/jonas-client_4_0.xsd rename to jonas/src/org/objectweb/jonas_client/deployment/jonas-client_4_0.xsd diff --git a/jonas/jonas/src/org/objectweb/jonas_client/deployment/jonas-client_4_1.xsd b/jonas/src/org/objectweb/jonas_client/deployment/jonas-client_4_1.xsd similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_client/deployment/jonas-client_4_1.xsd rename to jonas/src/org/objectweb/jonas_client/deployment/jonas-client_4_1.xsd diff --git a/jonas/jonas/src/org/objectweb/jonas_client/deployment/jonas-client_4_1_2.xsd b/jonas/src/org/objectweb/jonas_client/deployment/jonas-client_4_1_2.xsd similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_client/deployment/jonas-client_4_1_2.xsd rename to jonas/src/org/objectweb/jonas_client/deployment/jonas-client_4_1_2.xsd diff --git a/jonas/jonas/src/org/objectweb/jonas_client/deployment/jonas-client_4_1_4.xsd b/jonas/src/org/objectweb/jonas_client/deployment/jonas-client_4_1_4.xsd similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_client/deployment/jonas-client_4_1_4.xsd rename to jonas/src/org/objectweb/jonas_client/deployment/jonas-client_4_1_4.xsd diff --git a/jonas/jonas/src/org/objectweb/jonas_client/deployment/jonas-client_4_2.xsd b/jonas/src/org/objectweb/jonas_client/deployment/jonas-client_4_2.xsd similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_client/deployment/jonas-client_4_2.xsd rename to jonas/src/org/objectweb/jonas_client/deployment/jonas-client_4_2.xsd diff --git a/jonas/jonas/src/org/objectweb/jonas_client/deployment/lib/ClientDeploymentDescManager.java b/jonas/src/org/objectweb/jonas_client/deployment/lib/ClientDeploymentDescManager.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_client/deployment/lib/ClientDeploymentDescManager.java rename to jonas/src/org/objectweb/jonas_client/deployment/lib/ClientDeploymentDescManager.java diff --git a/jonas/jonas/src/org/objectweb/jonas_client/deployment/lib/wrapper/ClientManagerWrapper.java b/jonas/src/org/objectweb/jonas_client/deployment/lib/wrapper/ClientManagerWrapper.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_client/deployment/lib/wrapper/ClientManagerWrapper.java rename to jonas/src/org/objectweb/jonas_client/deployment/lib/wrapper/ClientManagerWrapper.java diff --git a/jonas/jonas/src/org/objectweb/jonas_client/deployment/rules/ApplicationClientRuleSet.java b/jonas/src/org/objectweb/jonas_client/deployment/rules/ApplicationClientRuleSet.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_client/deployment/rules/ApplicationClientRuleSet.java rename to jonas/src/org/objectweb/jonas_client/deployment/rules/ApplicationClientRuleSet.java diff --git a/jonas/jonas/src/org/objectweb/jonas_client/deployment/rules/JonasClientRuleSet.java b/jonas/src/org/objectweb/jonas_client/deployment/rules/JonasClientRuleSet.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_client/deployment/rules/JonasClientRuleSet.java rename to jonas/src/org/objectweb/jonas_client/deployment/rules/JonasClientRuleSet.java diff --git a/jonas/jonas/src/org/objectweb/jonas_client/deployment/rules/JonasSecurityRuleSet.java b/jonas/src/org/objectweb/jonas_client/deployment/rules/JonasSecurityRuleSet.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_client/deployment/rules/JonasSecurityRuleSet.java rename to jonas/src/org/objectweb/jonas_client/deployment/rules/JonasSecurityRuleSet.java diff --git a/jonas/jonas/src/org/objectweb/jonas_client/deployment/tests/ClientDeploymentTest.java b/jonas/src/org/objectweb/jonas_client/deployment/tests/ClientDeploymentTest.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_client/deployment/tests/ClientDeploymentTest.java rename to jonas/src/org/objectweb/jonas_client/deployment/tests/ClientDeploymentTest.java diff --git a/jonas/jonas/src/org/objectweb/jonas_client/deployment/tests/JonasClientDeploymentTest.java b/jonas/src/org/objectweb/jonas_client/deployment/tests/JonasClientDeploymentTest.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_client/deployment/tests/JonasClientDeploymentTest.java rename to jonas/src/org/objectweb/jonas_client/deployment/tests/JonasClientDeploymentTest.java diff --git a/jonas/jonas/src/org/objectweb/jonas_client/deployment/xml/ApplicationClient.java b/jonas/src/org/objectweb/jonas_client/deployment/xml/ApplicationClient.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_client/deployment/xml/ApplicationClient.java rename to jonas/src/org/objectweb/jonas_client/deployment/xml/ApplicationClient.java diff --git a/jonas/jonas/src/org/objectweb/jonas_client/deployment/xml/JonasClient.java b/jonas/src/org/objectweb/jonas_client/deployment/xml/JonasClient.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_client/deployment/xml/JonasClient.java rename to jonas/src/org/objectweb/jonas_client/deployment/xml/JonasClient.java diff --git a/jonas/jonas/src/org/objectweb/jonas_client/deployment/xml/JonasSecurity.java b/jonas/src/org/objectweb/jonas_client/deployment/xml/JonasSecurity.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_client/deployment/xml/JonasSecurity.java rename to jonas/src/org/objectweb/jonas_client/deployment/xml/JonasSecurity.java diff --git a/jonas/jonas/src/org/objectweb/jonas_clusterd/api/ClusterDaemonConfiguration.java b/jonas/src/org/objectweb/jonas_clusterd/api/ClusterDaemonConfiguration.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_clusterd/api/ClusterDaemonConfiguration.java rename to jonas/src/org/objectweb/jonas_clusterd/api/ClusterDaemonConfiguration.java diff --git a/jonas/jonas/src/org/objectweb/jonas_clusterd/api/ClusterDaemonConfigurationException.java b/jonas/src/org/objectweb/jonas_clusterd/api/ClusterDaemonConfigurationException.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_clusterd/api/ClusterDaemonConfigurationException.java rename to jonas/src/org/objectweb/jonas_clusterd/api/ClusterDaemonConfigurationException.java diff --git a/jonas/jonas/src/org/objectweb/jonas_clusterd/api/ClusterDaemonSchemas.java b/jonas/src/org/objectweb/jonas_clusterd/api/ClusterDaemonSchemas.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_clusterd/api/ClusterDaemonSchemas.java rename to jonas/src/org/objectweb/jonas_clusterd/api/ClusterDaemonSchemas.java diff --git a/jonas/jonas/src/org/objectweb/jonas_clusterd/jonas-clusterd_4_8.xsd b/jonas/src/org/objectweb/jonas_clusterd/jonas-clusterd_4_8.xsd similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_clusterd/jonas-clusterd_4_8.xsd rename to jonas/src/org/objectweb/jonas_clusterd/jonas-clusterd_4_8.xsd diff --git a/jonas/jonas/src/org/objectweb/jonas_clusterd/lib/ClusterDaemonConfigurationManager.java b/jonas/src/org/objectweb/jonas_clusterd/lib/ClusterDaemonConfigurationManager.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_clusterd/lib/ClusterDaemonConfigurationManager.java rename to jonas/src/org/objectweb/jonas_clusterd/lib/ClusterDaemonConfigurationManager.java diff --git a/jonas/jonas/src/org/objectweb/jonas_clusterd/lib/wrapper/ClusterDaemonConfigurationManagerWrapper.java b/jonas/src/org/objectweb/jonas_clusterd/lib/wrapper/ClusterDaemonConfigurationManagerWrapper.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_clusterd/lib/wrapper/ClusterDaemonConfigurationManagerWrapper.java rename to jonas/src/org/objectweb/jonas_clusterd/lib/wrapper/ClusterDaemonConfigurationManagerWrapper.java diff --git a/jonas/jonas/src/org/objectweb/jonas_clusterd/rules/ClusterDaemonRuleSet.java b/jonas/src/org/objectweb/jonas_clusterd/rules/ClusterDaemonRuleSet.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_clusterd/rules/ClusterDaemonRuleSet.java rename to jonas/src/org/objectweb/jonas_clusterd/rules/ClusterDaemonRuleSet.java diff --git a/jonas/jonas/src/org/objectweb/jonas_clusterd/rules/ServerRuleSet.java b/jonas/src/org/objectweb/jonas_clusterd/rules/ServerRuleSet.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_clusterd/rules/ServerRuleSet.java rename to jonas/src/org/objectweb/jonas_clusterd/rules/ServerRuleSet.java diff --git a/jonas/jonas/src/org/objectweb/jonas_clusterd/tests/ClusterDaemonConfigurationTest.java b/jonas/src/org/objectweb/jonas_clusterd/tests/ClusterDaemonConfigurationTest.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_clusterd/tests/ClusterDaemonConfigurationTest.java rename to jonas/src/org/objectweb/jonas_clusterd/tests/ClusterDaemonConfigurationTest.java diff --git a/jonas/jonas/src/org/objectweb/jonas_clusterd/xml/ClusterDaemon.java b/jonas/src/org/objectweb/jonas_clusterd/xml/ClusterDaemon.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_clusterd/xml/ClusterDaemon.java rename to jonas/src/org/objectweb/jonas_clusterd/xml/ClusterDaemon.java diff --git a/jonas/jonas/src/org/objectweb/jonas_clusterd/xml/Server.java b/jonas/src/org/objectweb/jonas_clusterd/xml/Server.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_clusterd/xml/Server.java rename to jonas/src/org/objectweb/jonas_clusterd/xml/Server.java diff --git a/jonas/jonas/src/org/objectweb/jonas_domain/api/DomainMap.java b/jonas/src/org/objectweb/jonas_domain/api/DomainMap.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_domain/api/DomainMap.java rename to jonas/src/org/objectweb/jonas_domain/api/DomainMap.java diff --git a/jonas/jonas/src/org/objectweb/jonas_domain/api/DomainMapException.java b/jonas/src/org/objectweb/jonas_domain/api/DomainMapException.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_domain/api/DomainMapException.java rename to jonas/src/org/objectweb/jonas_domain/api/DomainMapException.java diff --git a/jonas/jonas/src/org/objectweb/jonas_domain/api/DomainSchemas.java b/jonas/src/org/objectweb/jonas_domain/api/DomainSchemas.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_domain/api/DomainSchemas.java rename to jonas/src/org/objectweb/jonas_domain/api/DomainSchemas.java diff --git a/jonas/jonas/src/org/objectweb/jonas_domain/jonas-domain_4_7.xsd b/jonas/src/org/objectweb/jonas_domain/jonas-domain_4_7.xsd similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_domain/jonas-domain_4_7.xsd rename to jonas/src/org/objectweb/jonas_domain/jonas-domain_4_7.xsd diff --git a/jonas/jonas/src/org/objectweb/jonas_domain/lib/DomainMapManager.java b/jonas/src/org/objectweb/jonas_domain/lib/DomainMapManager.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_domain/lib/DomainMapManager.java rename to jonas/src/org/objectweb/jonas_domain/lib/DomainMapManager.java diff --git a/jonas/jonas/src/org/objectweb/jonas_domain/lib/wrapper/DomainManagerWrapper.java b/jonas/src/org/objectweb/jonas_domain/lib/wrapper/DomainManagerWrapper.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_domain/lib/wrapper/DomainManagerWrapper.java rename to jonas/src/org/objectweb/jonas_domain/lib/wrapper/DomainManagerWrapper.java diff --git a/jonas/jonas/src/org/objectweb/jonas_domain/rules/ClusterDaemonRuleSet.java b/jonas/src/org/objectweb/jonas_domain/rules/ClusterDaemonRuleSet.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_domain/rules/ClusterDaemonRuleSet.java rename to jonas/src/org/objectweb/jonas_domain/rules/ClusterDaemonRuleSet.java diff --git a/jonas/jonas/src/org/objectweb/jonas_domain/rules/ClusterRuleSet.java b/jonas/src/org/objectweb/jonas_domain/rules/ClusterRuleSet.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_domain/rules/ClusterRuleSet.java rename to jonas/src/org/objectweb/jonas_domain/rules/ClusterRuleSet.java diff --git a/jonas/jonas/src/org/objectweb/jonas_domain/rules/DomainRuleSet.java b/jonas/src/org/objectweb/jonas_domain/rules/DomainRuleSet.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_domain/rules/DomainRuleSet.java rename to jonas/src/org/objectweb/jonas_domain/rules/DomainRuleSet.java diff --git a/jonas/jonas/src/org/objectweb/jonas_domain/rules/LocationRuleSet.java b/jonas/src/org/objectweb/jonas_domain/rules/LocationRuleSet.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_domain/rules/LocationRuleSet.java rename to jonas/src/org/objectweb/jonas_domain/rules/LocationRuleSet.java diff --git a/jonas/jonas/src/org/objectweb/jonas_domain/rules/ServerRuleSet.java b/jonas/src/org/objectweb/jonas_domain/rules/ServerRuleSet.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_domain/rules/ServerRuleSet.java rename to jonas/src/org/objectweb/jonas_domain/rules/ServerRuleSet.java diff --git a/jonas/jonas/src/org/objectweb/jonas_domain/tests/DomainMapTest.java b/jonas/src/org/objectweb/jonas_domain/tests/DomainMapTest.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_domain/tests/DomainMapTest.java rename to jonas/src/org/objectweb/jonas_domain/tests/DomainMapTest.java diff --git a/jonas/jonas/src/org/objectweb/jonas_domain/xml/Cluster.java b/jonas/src/org/objectweb/jonas_domain/xml/Cluster.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_domain/xml/Cluster.java rename to jonas/src/org/objectweb/jonas_domain/xml/Cluster.java diff --git a/jonas/jonas/src/org/objectweb/jonas_domain/xml/ClusterDaemon.java b/jonas/src/org/objectweb/jonas_domain/xml/ClusterDaemon.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_domain/xml/ClusterDaemon.java rename to jonas/src/org/objectweb/jonas_domain/xml/ClusterDaemon.java diff --git a/jonas/jonas/src/org/objectweb/jonas_domain/xml/Domain.java b/jonas/src/org/objectweb/jonas_domain/xml/Domain.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_domain/xml/Domain.java rename to jonas/src/org/objectweb/jonas_domain/xml/Domain.java diff --git a/jonas/jonas/src/org/objectweb/jonas_domain/xml/Location.java b/jonas/src/org/objectweb/jonas_domain/xml/Location.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_domain/xml/Location.java rename to jonas/src/org/objectweb/jonas_domain/xml/Location.java diff --git a/jonas/jonas/src/org/objectweb/jonas_domain/xml/Server.java b/jonas/src/org/objectweb/jonas_domain/xml/Server.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_domain/xml/Server.java rename to jonas/src/org/objectweb/jonas_domain/xml/Server.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ear/deployment/api/EarDTDs.java b/jonas/src/org/objectweb/jonas_ear/deployment/api/EarDTDs.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ear/deployment/api/EarDTDs.java rename to jonas/src/org/objectweb/jonas_ear/deployment/api/EarDTDs.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ear/deployment/api/EarDeploymentDesc.java b/jonas/src/org/objectweb/jonas_ear/deployment/api/EarDeploymentDesc.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ear/deployment/api/EarDeploymentDesc.java rename to jonas/src/org/objectweb/jonas_ear/deployment/api/EarDeploymentDesc.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ear/deployment/api/EarDeploymentDescException.java b/jonas/src/org/objectweb/jonas_ear/deployment/api/EarDeploymentDescException.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ear/deployment/api/EarDeploymentDescException.java rename to jonas/src/org/objectweb/jonas_ear/deployment/api/EarDeploymentDescException.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ear/deployment/api/EarSchemas.java b/jonas/src/org/objectweb/jonas_ear/deployment/api/EarSchemas.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ear/deployment/api/EarSchemas.java rename to jonas/src/org/objectweb/jonas_ear/deployment/api/EarSchemas.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ear/deployment/api/JonasEarSchemas.java b/jonas/src/org/objectweb/jonas_ear/deployment/api/JonasEarSchemas.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ear/deployment/api/JonasEarSchemas.java rename to jonas/src/org/objectweb/jonas_ear/deployment/api/JonasEarSchemas.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ear/deployment/application_1_2.dtd b/jonas/src/org/objectweb/jonas_ear/deployment/application_1_2.dtd similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ear/deployment/application_1_2.dtd rename to jonas/src/org/objectweb/jonas_ear/deployment/application_1_2.dtd diff --git a/jonas/jonas/src/org/objectweb/jonas_ear/deployment/application_1_3.dtd b/jonas/src/org/objectweb/jonas_ear/deployment/application_1_3.dtd similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ear/deployment/application_1_3.dtd rename to jonas/src/org/objectweb/jonas_ear/deployment/application_1_3.dtd diff --git a/jonas/jonas/src/org/objectweb/jonas_ear/deployment/application_1_4.xsd b/jonas/src/org/objectweb/jonas_ear/deployment/application_1_4.xsd similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ear/deployment/application_1_4.xsd rename to jonas/src/org/objectweb/jonas_ear/deployment/application_1_4.xsd diff --git a/jonas/jonas/src/org/objectweb/jonas_ear/deployment/jonas-application_4_1_4.xsd b/jonas/src/org/objectweb/jonas_ear/deployment/jonas-application_4_1_4.xsd similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ear/deployment/jonas-application_4_1_4.xsd rename to jonas/src/org/objectweb/jonas_ear/deployment/jonas-application_4_1_4.xsd diff --git a/jonas/jonas/src/org/objectweb/jonas_ear/deployment/lib/EarDeploymentDescManager.java b/jonas/src/org/objectweb/jonas_ear/deployment/lib/EarDeploymentDescManager.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ear/deployment/lib/EarDeploymentDescManager.java rename to jonas/src/org/objectweb/jonas_ear/deployment/lib/EarDeploymentDescManager.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ear/deployment/lib/wrapper/EarManagerWrapper.java b/jonas/src/org/objectweb/jonas_ear/deployment/lib/wrapper/EarManagerWrapper.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ear/deployment/lib/wrapper/EarManagerWrapper.java rename to jonas/src/org/objectweb/jonas_ear/deployment/lib/wrapper/EarManagerWrapper.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ear/deployment/rules/ApplicationRuleSet.java b/jonas/src/org/objectweb/jonas_ear/deployment/rules/ApplicationRuleSet.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ear/deployment/rules/ApplicationRuleSet.java rename to jonas/src/org/objectweb/jonas_ear/deployment/rules/ApplicationRuleSet.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ear/deployment/rules/JonasApplicationRuleSet.java b/jonas/src/org/objectweb/jonas_ear/deployment/rules/JonasApplicationRuleSet.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ear/deployment/rules/JonasApplicationRuleSet.java rename to jonas/src/org/objectweb/jonas_ear/deployment/rules/JonasApplicationRuleSet.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ear/deployment/rules/JonasSecurityRoleMappingRuleSet.java b/jonas/src/org/objectweb/jonas_ear/deployment/rules/JonasSecurityRoleMappingRuleSet.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ear/deployment/rules/JonasSecurityRoleMappingRuleSet.java rename to jonas/src/org/objectweb/jonas_ear/deployment/rules/JonasSecurityRoleMappingRuleSet.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ear/deployment/rules/JonasSecurityRuleSet.java b/jonas/src/org/objectweb/jonas_ear/deployment/rules/JonasSecurityRuleSet.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ear/deployment/rules/JonasSecurityRuleSet.java rename to jonas/src/org/objectweb/jonas_ear/deployment/rules/JonasSecurityRuleSet.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ear/deployment/rules/ModuleRuleSet.java b/jonas/src/org/objectweb/jonas_ear/deployment/rules/ModuleRuleSet.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ear/deployment/rules/ModuleRuleSet.java rename to jonas/src/org/objectweb/jonas_ear/deployment/rules/ModuleRuleSet.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ear/deployment/rules/SecurityRoleRuleSet.java b/jonas/src/org/objectweb/jonas_ear/deployment/rules/SecurityRoleRuleSet.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ear/deployment/rules/SecurityRoleRuleSet.java rename to jonas/src/org/objectweb/jonas_ear/deployment/rules/SecurityRoleRuleSet.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ear/deployment/rules/WebRuleSet.java b/jonas/src/org/objectweb/jonas_ear/deployment/rules/WebRuleSet.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ear/deployment/rules/WebRuleSet.java rename to jonas/src/org/objectweb/jonas_ear/deployment/rules/WebRuleSet.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ear/deployment/tests/EarDeploymentTest.java b/jonas/src/org/objectweb/jonas_ear/deployment/tests/EarDeploymentTest.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ear/deployment/tests/EarDeploymentTest.java rename to jonas/src/org/objectweb/jonas_ear/deployment/tests/EarDeploymentTest.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ear/deployment/xml/Application.java b/jonas/src/org/objectweb/jonas_ear/deployment/xml/Application.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ear/deployment/xml/Application.java rename to jonas/src/org/objectweb/jonas_ear/deployment/xml/Application.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ear/deployment/xml/JonasApplication.java b/jonas/src/org/objectweb/jonas_ear/deployment/xml/JonasApplication.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ear/deployment/xml/JonasApplication.java rename to jonas/src/org/objectweb/jonas_ear/deployment/xml/JonasApplication.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ear/deployment/xml/JonasSecurity.java b/jonas/src/org/objectweb/jonas_ear/deployment/xml/JonasSecurity.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ear/deployment/xml/JonasSecurity.java rename to jonas/src/org/objectweb/jonas_ear/deployment/xml/JonasSecurity.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ear/deployment/xml/Module.java b/jonas/src/org/objectweb/jonas_ear/deployment/xml/Module.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ear/deployment/xml/Module.java rename to jonas/src/org/objectweb/jonas_ear/deployment/xml/Module.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ear/deployment/xml/SecurityRole.java b/jonas/src/org/objectweb/jonas_ear/deployment/xml/SecurityRole.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ear/deployment/xml/SecurityRole.java rename to jonas/src/org/objectweb/jonas_ear/deployment/xml/SecurityRole.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ear/deployment/xml/SecurityRoleMapping.java b/jonas/src/org/objectweb/jonas_ear/deployment/xml/SecurityRoleMapping.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ear/deployment/xml/SecurityRoleMapping.java rename to jonas/src/org/objectweb/jonas_ear/deployment/xml/SecurityRoleMapping.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ear/deployment/xml/Web.java b/jonas/src/org/objectweb/jonas_ear/deployment/xml/Web.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ear/deployment/xml/Web.java rename to jonas/src/org/objectweb/jonas_ear/deployment/xml/Web.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/container/BeanFactory.java b/jonas/src/org/objectweb/jonas_ejb/container/BeanFactory.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/container/BeanFactory.java rename to jonas/src/org/objectweb/jonas_ejb/container/BeanFactory.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/container/Container.java b/jonas/src/org/objectweb/jonas_ejb/container/Container.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/container/Container.java rename to jonas/src/org/objectweb/jonas_ejb/container/Container.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/container/EntityCounters.java b/jonas/src/org/objectweb/jonas_ejb/container/EntityCounters.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/container/EntityCounters.java rename to jonas/src/org/objectweb/jonas_ejb/container/EntityCounters.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/container/HomeFactory.java b/jonas/src/org/objectweb/jonas_ejb/container/HomeFactory.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/container/HomeFactory.java rename to jonas/src/org/objectweb/jonas_ejb/container/HomeFactory.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/container/JContainer.java b/jonas/src/org/objectweb/jonas_ejb/container/JContainer.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/container/JContainer.java rename to jonas/src/org/objectweb/jonas_ejb/container/JContainer.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/container/JContext.java b/jonas/src/org/objectweb/jonas_ejb/container/JContext.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/container/JContext.java rename to jonas/src/org/objectweb/jonas_ejb/container/JContext.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/container/JEntityContext.java b/jonas/src/org/objectweb/jonas_ejb/container/JEntityContext.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/container/JEntityContext.java rename to jonas/src/org/objectweb/jonas_ejb/container/JEntityContext.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/container/JEntityFactory.java b/jonas/src/org/objectweb/jonas_ejb/container/JEntityFactory.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/container/JEntityFactory.java rename to jonas/src/org/objectweb/jonas_ejb/container/JEntityFactory.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/container/JEntityHandle.java b/jonas/src/org/objectweb/jonas_ejb/container/JEntityHandle.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/container/JEntityHandle.java rename to jonas/src/org/objectweb/jonas_ejb/container/JEntityHandle.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/container/JEntityHome.java b/jonas/src/org/objectweb/jonas_ejb/container/JEntityHome.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/container/JEntityHome.java rename to jonas/src/org/objectweb/jonas_ejb/container/JEntityHome.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/container/JEntityLocal.java b/jonas/src/org/objectweb/jonas_ejb/container/JEntityLocal.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/container/JEntityLocal.java rename to jonas/src/org/objectweb/jonas_ejb/container/JEntityLocal.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/container/JEntityLocalHome.java b/jonas/src/org/objectweb/jonas_ejb/container/JEntityLocalHome.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/container/JEntityLocalHome.java rename to jonas/src/org/objectweb/jonas_ejb/container/JEntityLocalHome.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/container/JEntityRemote.java b/jonas/src/org/objectweb/jonas_ejb/container/JEntityRemote.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/container/JEntityRemote.java rename to jonas/src/org/objectweb/jonas_ejb/container/JEntityRemote.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/container/JEntitySwitch.java b/jonas/src/org/objectweb/jonas_ejb/container/JEntitySwitch.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/container/JEntitySwitch.java rename to jonas/src/org/objectweb/jonas_ejb/container/JEntitySwitch.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/container/JEntitySwitchCRC.java b/jonas/src/org/objectweb/jonas_ejb/container/JEntitySwitchCRC.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/container/JEntitySwitchCRC.java rename to jonas/src/org/objectweb/jonas_ejb/container/JEntitySwitchCRC.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/container/JEntitySwitchCRU.java b/jonas/src/org/objectweb/jonas_ejb/container/JEntitySwitchCRU.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/container/JEntitySwitchCRU.java rename to jonas/src/org/objectweb/jonas_ejb/container/JEntitySwitchCRU.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/container/JEntitySwitchCRW.java b/jonas/src/org/objectweb/jonas_ejb/container/JEntitySwitchCRW.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/container/JEntitySwitchCRW.java rename to jonas/src/org/objectweb/jonas_ejb/container/JEntitySwitchCRW.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/container/JEntitySwitchCS.java b/jonas/src/org/objectweb/jonas_ejb/container/JEntitySwitchCS.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/container/JEntitySwitchCS.java rename to jonas/src/org/objectweb/jonas_ejb/container/JEntitySwitchCS.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/container/JEntitySwitchCST.java b/jonas/src/org/objectweb/jonas_ejb/container/JEntitySwitchCST.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/container/JEntitySwitchCST.java rename to jonas/src/org/objectweb/jonas_ejb/container/JEntitySwitchCST.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/container/JEntitySwitchDB.java b/jonas/src/org/objectweb/jonas_ejb/container/JEntitySwitchDB.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/container/JEntitySwitchDB.java rename to jonas/src/org/objectweb/jonas_ejb/container/JEntitySwitchDB.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/container/JEntitySwitchRO.java b/jonas/src/org/objectweb/jonas_ejb/container/JEntitySwitchRO.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/container/JEntitySwitchRO.java rename to jonas/src/org/objectweb/jonas_ejb/container/JEntitySwitchRO.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/container/JFactory.java b/jonas/src/org/objectweb/jonas_ejb/container/JFactory.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/container/JFactory.java rename to jonas/src/org/objectweb/jonas_ejb/container/JFactory.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/container/JHandleDelegate.java b/jonas/src/org/objectweb/jonas_ejb/container/JHandleDelegate.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/container/JHandleDelegate.java rename to jonas/src/org/objectweb/jonas_ejb/container/JHandleDelegate.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/container/JHome.java b/jonas/src/org/objectweb/jonas_ejb/container/JHome.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/container/JHome.java rename to jonas/src/org/objectweb/jonas_ejb/container/JHome.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/container/JHomeHandle.java b/jonas/src/org/objectweb/jonas_ejb/container/JHomeHandle.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/container/JHomeHandle.java rename to jonas/src/org/objectweb/jonas_ejb/container/JHomeHandle.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/container/JLocal.java b/jonas/src/org/objectweb/jonas_ejb/container/JLocal.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/container/JLocal.java rename to jonas/src/org/objectweb/jonas_ejb/container/JLocal.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/container/JLocalHome.java b/jonas/src/org/objectweb/jonas_ejb/container/JLocalHome.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/container/JLocalHome.java rename to jonas/src/org/objectweb/jonas_ejb/container/JLocalHome.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/container/JMdbEndpointFactory.java b/jonas/src/org/objectweb/jonas_ejb/container/JMdbEndpointFactory.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/container/JMdbEndpointFactory.java rename to jonas/src/org/objectweb/jonas_ejb/container/JMdbEndpointFactory.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/container/JMdbFactory.java b/jonas/src/org/objectweb/jonas_ejb/container/JMdbFactory.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/container/JMdbFactory.java rename to jonas/src/org/objectweb/jonas_ejb/container/JMdbFactory.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/container/JMessageDrivenBean.java b/jonas/src/org/objectweb/jonas_ejb/container/JMessageDrivenBean.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/container/JMessageDrivenBean.java rename to jonas/src/org/objectweb/jonas_ejb/container/JMessageDrivenBean.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/container/JMessageEndpoint.java b/jonas/src/org/objectweb/jonas_ejb/container/JMessageEndpoint.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/container/JMessageEndpoint.java rename to jonas/src/org/objectweb/jonas_ejb/container/JMessageEndpoint.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/container/JMessageEndpointProxy.java b/jonas/src/org/objectweb/jonas_ejb/container/JMessageEndpointProxy.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/container/JMessageEndpointProxy.java rename to jonas/src/org/objectweb/jonas_ejb/container/JMessageEndpointProxy.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/container/JObjectInputStream.java b/jonas/src/org/objectweb/jonas_ejb/container/JObjectInputStream.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/container/JObjectInputStream.java rename to jonas/src/org/objectweb/jonas_ejb/container/JObjectInputStream.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/container/JRemote.java b/jonas/src/org/objectweb/jonas_ejb/container/JRemote.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/container/JRemote.java rename to jonas/src/org/objectweb/jonas_ejb/container/JRemote.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/container/JRepEntityHome.java b/jonas/src/org/objectweb/jonas_ejb/container/JRepEntityHome.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/container/JRepEntityHome.java rename to jonas/src/org/objectweb/jonas_ejb/container/JRepEntityHome.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/container/JRepEntityLocal.java b/jonas/src/org/objectweb/jonas_ejb/container/JRepEntityLocal.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/container/JRepEntityLocal.java rename to jonas/src/org/objectweb/jonas_ejb/container/JRepEntityLocal.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/container/JRepEntityLocalHome.java b/jonas/src/org/objectweb/jonas_ejb/container/JRepEntityLocalHome.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/container/JRepEntityLocalHome.java rename to jonas/src/org/objectweb/jonas_ejb/container/JRepEntityLocalHome.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/container/JRepEntityRemote.java b/jonas/src/org/objectweb/jonas_ejb/container/JRepEntityRemote.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/container/JRepEntityRemote.java rename to jonas/src/org/objectweb/jonas_ejb/container/JRepEntityRemote.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/container/JRepStatefulContext.java b/jonas/src/org/objectweb/jonas_ejb/container/JRepStatefulContext.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/container/JRepStatefulContext.java rename to jonas/src/org/objectweb/jonas_ejb/container/JRepStatefulContext.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/container/JRepStatefulHome.java b/jonas/src/org/objectweb/jonas_ejb/container/JRepStatefulHome.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/container/JRepStatefulHome.java rename to jonas/src/org/objectweb/jonas_ejb/container/JRepStatefulHome.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/container/JRepStatefulInputStream.java b/jonas/src/org/objectweb/jonas_ejb/container/JRepStatefulInputStream.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/container/JRepStatefulInputStream.java rename to jonas/src/org/objectweb/jonas_ejb/container/JRepStatefulInputStream.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/container/JRepStatefulLocal.java b/jonas/src/org/objectweb/jonas_ejb/container/JRepStatefulLocal.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/container/JRepStatefulLocal.java rename to jonas/src/org/objectweb/jonas_ejb/container/JRepStatefulLocal.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/container/JRepStatefulLocalHome.java b/jonas/src/org/objectweb/jonas_ejb/container/JRepStatefulLocalHome.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/container/JRepStatefulLocalHome.java rename to jonas/src/org/objectweb/jonas_ejb/container/JRepStatefulLocalHome.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/container/JRepStatefulObjectId.java b/jonas/src/org/objectweb/jonas_ejb/container/JRepStatefulObjectId.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/container/JRepStatefulObjectId.java rename to jonas/src/org/objectweb/jonas_ejb/container/JRepStatefulObjectId.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/container/JRepStatefulOutputStream.java b/jonas/src/org/objectweb/jonas_ejb/container/JRepStatefulOutputStream.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/container/JRepStatefulOutputStream.java rename to jonas/src/org/objectweb/jonas_ejb/container/JRepStatefulOutputStream.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/container/JRepStatefulRemote.java b/jonas/src/org/objectweb/jonas_ejb/container/JRepStatefulRemote.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/container/JRepStatefulRemote.java rename to jonas/src/org/objectweb/jonas_ejb/container/JRepStatefulRemote.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/container/JRepStatelessHome.java b/jonas/src/org/objectweb/jonas_ejb/container/JRepStatelessHome.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/container/JRepStatelessHome.java rename to jonas/src/org/objectweb/jonas_ejb/container/JRepStatelessHome.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/container/JRepStatelessRemote.java b/jonas/src/org/objectweb/jonas_ejb/container/JRepStatelessRemote.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/container/JRepStatelessRemote.java rename to jonas/src/org/objectweb/jonas_ejb/container/JRepStatelessRemote.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/container/JRepUtil.java b/jonas/src/org/objectweb/jonas_ejb/container/JRepUtil.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/container/JRepUtil.java rename to jonas/src/org/objectweb/jonas_ejb/container/JRepUtil.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/container/JServiceEndpoint.java b/jonas/src/org/objectweb/jonas_ejb/container/JServiceEndpoint.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/container/JServiceEndpoint.java rename to jonas/src/org/objectweb/jonas_ejb/container/JServiceEndpoint.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/container/JServiceEndpointHome.java b/jonas/src/org/objectweb/jonas_ejb/container/JServiceEndpointHome.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/container/JServiceEndpointHome.java rename to jonas/src/org/objectweb/jonas_ejb/container/JServiceEndpointHome.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/container/JSessionContext.java b/jonas/src/org/objectweb/jonas_ejb/container/JSessionContext.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/container/JSessionContext.java rename to jonas/src/org/objectweb/jonas_ejb/container/JSessionContext.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/container/JSessionFactory.java b/jonas/src/org/objectweb/jonas_ejb/container/JSessionFactory.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/container/JSessionFactory.java rename to jonas/src/org/objectweb/jonas_ejb/container/JSessionFactory.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/container/JSessionHandle.java b/jonas/src/org/objectweb/jonas_ejb/container/JSessionHandle.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/container/JSessionHandle.java rename to jonas/src/org/objectweb/jonas_ejb/container/JSessionHandle.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/container/JSessionHome.java b/jonas/src/org/objectweb/jonas_ejb/container/JSessionHome.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/container/JSessionHome.java rename to jonas/src/org/objectweb/jonas_ejb/container/JSessionHome.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/container/JSessionLocal.java b/jonas/src/org/objectweb/jonas_ejb/container/JSessionLocal.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/container/JSessionLocal.java rename to jonas/src/org/objectweb/jonas_ejb/container/JSessionLocal.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/container/JSessionLocalHome.java b/jonas/src/org/objectweb/jonas_ejb/container/JSessionLocalHome.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/container/JSessionLocalHome.java rename to jonas/src/org/objectweb/jonas_ejb/container/JSessionLocalHome.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/container/JSessionRemote.java b/jonas/src/org/objectweb/jonas_ejb/container/JSessionRemote.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/container/JSessionRemote.java rename to jonas/src/org/objectweb/jonas_ejb/container/JSessionRemote.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/container/JSessionSwitch.java b/jonas/src/org/objectweb/jonas_ejb/container/JSessionSwitch.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/container/JSessionSwitch.java rename to jonas/src/org/objectweb/jonas_ejb/container/JSessionSwitch.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/container/JStatefulContext.java b/jonas/src/org/objectweb/jonas_ejb/container/JStatefulContext.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/container/JStatefulContext.java rename to jonas/src/org/objectweb/jonas_ejb/container/JStatefulContext.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/container/JStatefulFactory.java b/jonas/src/org/objectweb/jonas_ejb/container/JStatefulFactory.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/container/JStatefulFactory.java rename to jonas/src/org/objectweb/jonas_ejb/container/JStatefulFactory.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/container/JStatefulInputStream.java b/jonas/src/org/objectweb/jonas_ejb/container/JStatefulInputStream.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/container/JStatefulInputStream.java rename to jonas/src/org/objectweb/jonas_ejb/container/JStatefulInputStream.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/container/JStatefulOutputStream.java b/jonas/src/org/objectweb/jonas_ejb/container/JStatefulOutputStream.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/container/JStatefulOutputStream.java rename to jonas/src/org/objectweb/jonas_ejb/container/JStatefulOutputStream.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/container/JStatefulSwitch.java b/jonas/src/org/objectweb/jonas_ejb/container/JStatefulSwitch.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/container/JStatefulSwitch.java rename to jonas/src/org/objectweb/jonas_ejb/container/JStatefulSwitch.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/container/JStatelessContext.java b/jonas/src/org/objectweb/jonas_ejb/container/JStatelessContext.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/container/JStatelessContext.java rename to jonas/src/org/objectweb/jonas_ejb/container/JStatelessContext.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/container/JStatelessFactory.java b/jonas/src/org/objectweb/jonas_ejb/container/JStatelessFactory.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/container/JStatelessFactory.java rename to jonas/src/org/objectweb/jonas_ejb/container/JStatelessFactory.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/container/JStatelessSwitch.java b/jonas/src/org/objectweb/jonas_ejb/container/JStatelessSwitch.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/container/JStatelessSwitch.java rename to jonas/src/org/objectweb/jonas_ejb/container/JStatelessSwitch.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/container/JTimer.java b/jonas/src/org/objectweb/jonas_ejb/container/JTimer.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/container/JTimer.java rename to jonas/src/org/objectweb/jonas_ejb/container/JTimer.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/container/JTimerHandle.java b/jonas/src/org/objectweb/jonas_ejb/container/JTimerHandle.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/container/JTimerHandle.java rename to jonas/src/org/objectweb/jonas_ejb/container/JTimerHandle.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/container/JTimerService.java b/jonas/src/org/objectweb/jonas_ejb/container/JTimerService.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/container/JTimerService.java rename to jonas/src/org/objectweb/jonas_ejb/container/JTimerService.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/container/JWrapper.java b/jonas/src/org/objectweb/jonas_ejb/container/JWrapper.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/container/JWrapper.java rename to jonas/src/org/objectweb/jonas_ejb/container/JWrapper.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/container/PermissionManager.java b/jonas/src/org/objectweb/jonas_ejb/container/PermissionManager.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/container/PermissionManager.java rename to jonas/src/org/objectweb/jonas_ejb/container/PermissionManager.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/container/PrincipalFactory.java b/jonas/src/org/objectweb/jonas_ejb/container/PrincipalFactory.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/container/PrincipalFactory.java rename to jonas/src/org/objectweb/jonas_ejb/container/PrincipalFactory.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/container/RequestCtx.java b/jonas/src/org/objectweb/jonas_ejb/container/RequestCtx.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/container/RequestCtx.java rename to jonas/src/org/objectweb/jonas_ejb/container/RequestCtx.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/container/Swapper.java b/jonas/src/org/objectweb/jonas_ejb/container/Swapper.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/container/Swapper.java rename to jonas/src/org/objectweb/jonas_ejb/container/Swapper.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/container/TraceEjb.java b/jonas/src/org/objectweb/jonas_ejb/container/TraceEjb.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/container/TraceEjb.java rename to jonas/src/org/objectweb/jonas_ejb/container/TraceEjb.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/container/TxListener.java b/jonas/src/org/objectweb/jonas_ejb/container/TxListener.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/container/TxListener.java rename to jonas/src/org/objectweb/jonas_ejb/container/TxListener.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/container/jorm/Coder.java b/jonas/src/org/objectweb/jonas_ejb/container/jorm/Coder.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/container/jorm/Coder.java rename to jonas/src/org/objectweb/jonas_ejb/container/jorm/Coder.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/container/jorm/Collection.java b/jonas/src/org/objectweb/jonas_ejb/container/jorm/Collection.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/container/jorm/Collection.java rename to jonas/src/org/objectweb/jonas_ejb/container/jorm/Collection.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/container/jorm/CollectionElement.java b/jonas/src/org/objectweb/jonas_ejb/container/jorm/CollectionElement.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/container/jorm/CollectionElement.java rename to jonas/src/org/objectweb/jonas_ejb/container/jorm/CollectionElement.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/container/jorm/GenClassElement.java b/jonas/src/org/objectweb/jonas_ejb/container/jorm/GenClassElement.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/container/jorm/GenClassElement.java rename to jonas/src/org/objectweb/jonas_ejb/container/jorm/GenClassElement.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/container/jorm/GenClassImpl.java b/jonas/src/org/objectweb/jonas_ejb/container/jorm/GenClassImpl.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/container/jorm/GenClassImpl.java rename to jonas/src/org/objectweb/jonas_ejb/container/jorm/GenClassImpl.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/container/jorm/GenClassListener.java b/jonas/src/org/objectweb/jonas_ejb/container/jorm/GenClassListener.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/container/jorm/GenClassListener.java rename to jonas/src/org/objectweb/jonas_ejb/container/jorm/GenClassListener.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/container/jorm/JEntityContext.java b/jonas/src/org/objectweb/jonas_ejb/container/jorm/JEntityContext.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/container/jorm/JEntityContext.java rename to jonas/src/org/objectweb/jonas_ejb/container/jorm/JEntityContext.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/container/jorm/JormFactory.java b/jonas/src/org/objectweb/jonas_ejb/container/jorm/JormFactory.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/container/jorm/JormFactory.java rename to jonas/src/org/objectweb/jonas_ejb/container/jorm/JormFactory.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/container/jorm/MapperManager.java b/jonas/src/org/objectweb/jonas_ejb/container/jorm/MapperManager.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/container/jorm/MapperManager.java rename to jonas/src/org/objectweb/jonas_ejb/container/jorm/MapperManager.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/container/jorm/MedorFactory.java b/jonas/src/org/objectweb/jonas_ejb/container/jorm/MedorFactory.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/container/jorm/MedorFactory.java rename to jonas/src/org/objectweb/jonas_ejb/container/jorm/MedorFactory.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/container/jorm/PObject.java b/jonas/src/org/objectweb/jonas_ejb/container/jorm/PObject.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/container/jorm/PObject.java rename to jonas/src/org/objectweb/jonas_ejb/container/jorm/PObject.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/container/jorm/PObjectHome.java b/jonas/src/org/objectweb/jonas_ejb/container/jorm/PObjectHome.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/container/jorm/PObjectHome.java rename to jonas/src/org/objectweb/jonas_ejb/container/jorm/PObjectHome.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/container/jorm/RdbFactory.java b/jonas/src/org/objectweb/jonas_ejb/container/jorm/RdbFactory.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/container/jorm/RdbFactory.java rename to jonas/src/org/objectweb/jonas_ejb/container/jorm/RdbFactory.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/container/jorm/Set.java b/jonas/src/org/objectweb/jonas_ejb/container/jorm/Set.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/container/jorm/Set.java rename to jonas/src/org/objectweb/jonas_ejb/container/jorm/Set.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/api/ActivationConfigDesc.java b/jonas/src/org/objectweb/jonas_ejb/deployment/api/ActivationConfigDesc.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/api/ActivationConfigDesc.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/api/ActivationConfigDesc.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/api/ActivationConfigPropertyDesc.java b/jonas/src/org/objectweb/jonas_ejb/deployment/api/ActivationConfigPropertyDesc.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/api/ActivationConfigPropertyDesc.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/api/ActivationConfigPropertyDesc.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/api/BeanDesc.java b/jonas/src/org/objectweb/jonas_ejb/deployment/api/BeanDesc.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/api/BeanDesc.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/api/BeanDesc.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/api/CommonMethodDesc.java b/jonas/src/org/objectweb/jonas_ejb/deployment/api/CommonMethodDesc.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/api/CommonMethodDesc.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/api/CommonMethodDesc.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/api/DeploymentDesc.java b/jonas/src/org/objectweb/jonas_ejb/deployment/api/DeploymentDesc.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/api/DeploymentDesc.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/api/DeploymentDesc.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/api/DeploymentDescEjb1_1.java b/jonas/src/org/objectweb/jonas_ejb/deployment/api/DeploymentDescEjb1_1.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/api/DeploymentDescEjb1_1.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/api/DeploymentDescEjb1_1.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/api/DeploymentDescEjb2.java b/jonas/src/org/objectweb/jonas_ejb/deployment/api/DeploymentDescEjb2.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/api/DeploymentDescEjb2.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/api/DeploymentDescEjb2.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/api/EjbRelationDesc.java b/jonas/src/org/objectweb/jonas_ejb/deployment/api/EjbRelationDesc.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/api/EjbRelationDesc.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/api/EjbRelationDesc.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/api/EjbRelationshipRoleDesc.java b/jonas/src/org/objectweb/jonas_ejb/deployment/api/EjbRelationshipRoleDesc.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/api/EjbRelationshipRoleDesc.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/api/EjbRelationshipRoleDesc.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/api/EjbjarDTDs.java b/jonas/src/org/objectweb/jonas_ejb/deployment/api/EjbjarDTDs.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/api/EjbjarDTDs.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/api/EjbjarDTDs.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/api/EjbjarSchemas.java b/jonas/src/org/objectweb/jonas_ejb/deployment/api/EjbjarSchemas.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/api/EjbjarSchemas.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/api/EjbjarSchemas.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/api/EntityBmpDesc.java b/jonas/src/org/objectweb/jonas_ejb/deployment/api/EntityBmpDesc.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/api/EntityBmpDesc.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/api/EntityBmpDesc.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/api/EntityCmp1Desc.java b/jonas/src/org/objectweb/jonas_ejb/deployment/api/EntityCmp1Desc.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/api/EntityCmp1Desc.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/api/EntityCmp1Desc.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/api/EntityCmp2Desc.java b/jonas/src/org/objectweb/jonas_ejb/deployment/api/EntityCmp2Desc.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/api/EntityCmp2Desc.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/api/EntityCmp2Desc.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/api/EntityCmpDesc.java b/jonas/src/org/objectweb/jonas_ejb/deployment/api/EntityCmpDesc.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/api/EntityCmpDesc.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/api/EntityCmpDesc.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/api/EntityDesc.java b/jonas/src/org/objectweb/jonas_ejb/deployment/api/EntityDesc.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/api/EntityDesc.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/api/EntityDesc.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/api/EntityJdbcCmp1Desc.java b/jonas/src/org/objectweb/jonas_ejb/deployment/api/EntityJdbcCmp1Desc.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/api/EntityJdbcCmp1Desc.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/api/EntityJdbcCmp1Desc.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/api/EntityJdbcCmp2Desc.java b/jonas/src/org/objectweb/jonas_ejb/deployment/api/EntityJdbcCmp2Desc.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/api/EntityJdbcCmp2Desc.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/api/EntityJdbcCmp2Desc.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/api/ExcludeListDesc.java b/jonas/src/org/objectweb/jonas_ejb/deployment/api/ExcludeListDesc.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/api/ExcludeListDesc.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/api/ExcludeListDesc.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/api/FieldDesc.java b/jonas/src/org/objectweb/jonas_ejb/deployment/api/FieldDesc.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/api/FieldDesc.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/api/FieldDesc.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/api/FieldJdbcDesc.java b/jonas/src/org/objectweb/jonas_ejb/deployment/api/FieldJdbcDesc.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/api/FieldJdbcDesc.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/api/FieldJdbcDesc.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/api/JonasEjbjarDTDs.java b/jonas/src/org/objectweb/jonas_ejb/deployment/api/JonasEjbjarDTDs.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/api/JonasEjbjarDTDs.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/api/JonasEjbjarDTDs.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/api/JonasEjbjarSchemas.java b/jonas/src/org/objectweb/jonas_ejb/deployment/api/JonasEjbjarSchemas.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/api/JonasEjbjarSchemas.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/api/JonasEjbjarSchemas.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/api/MessageDrivenDesc.java b/jonas/src/org/objectweb/jonas_ejb/deployment/api/MessageDrivenDesc.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/api/MessageDrivenDesc.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/api/MessageDrivenDesc.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/api/MethodCmp2Desc.java b/jonas/src/org/objectweb/jonas_ejb/deployment/api/MethodCmp2Desc.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/api/MethodCmp2Desc.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/api/MethodCmp2Desc.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/api/MethodDesc.java b/jonas/src/org/objectweb/jonas_ejb/deployment/api/MethodDesc.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/api/MethodDesc.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/api/MethodDesc.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/api/MethodJdbcCmp1Desc.java b/jonas/src/org/objectweb/jonas_ejb/deployment/api/MethodJdbcCmp1Desc.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/api/MethodJdbcCmp1Desc.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/api/MethodJdbcCmp1Desc.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/api/MethodPermissionDesc.java b/jonas/src/org/objectweb/jonas_ejb/deployment/api/MethodPermissionDesc.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/api/MethodPermissionDesc.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/api/MethodPermissionDesc.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/api/SessionDesc.java b/jonas/src/org/objectweb/jonas_ejb/deployment/api/SessionDesc.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/api/SessionDesc.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/api/SessionDesc.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/api/SessionStatefulDesc.java b/jonas/src/org/objectweb/jonas_ejb/deployment/api/SessionStatefulDesc.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/api/SessionStatefulDesc.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/api/SessionStatefulDesc.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/api/SessionStatelessDesc.java b/jonas/src/org/objectweb/jonas_ejb/deployment/api/SessionStatelessDesc.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/api/SessionStatelessDesc.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/api/SessionStatelessDesc.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejb-jar_1_1.dtd b/jonas/src/org/objectweb/jonas_ejb/deployment/ejb-jar_1_1.dtd similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejb-jar_1_1.dtd rename to jonas/src/org/objectweb/jonas_ejb/deployment/ejb-jar_1_1.dtd diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejb-jar_2_0.dtd b/jonas/src/org/objectweb/jonas_ejb/deployment/ejb-jar_2_0.dtd similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejb-jar_2_0.dtd rename to jonas/src/org/objectweb/jonas_ejb/deployment/ejb-jar_2_0.dtd diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejb-jar_2_0_ws.dtd b/jonas/src/org/objectweb/jonas_ejb/deployment/ejb-jar_2_0_ws.dtd similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejb-jar_2_0_ws.dtd rename to jonas/src/org/objectweb/jonas_ejb/deployment/ejb-jar_2_0_ws.dtd diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejb-jar_2_1.xsd b/jonas/src/org/objectweb/jonas_ejb/deployment/ejb-jar_2_1.xsd similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejb-jar_2_1.xsd rename to jonas/src/org/objectweb/jonas_ejb/deployment/ejb-jar_2_1.xsd diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTAbstractSchemaName.java b/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTAbstractSchemaName.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTAbstractSchemaName.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTAbstractSchemaName.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTAggregateSelectExpression.java b/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTAggregateSelectExpression.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTAggregateSelectExpression.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTAggregateSelectExpression.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTArithmeticExpression.java b/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTArithmeticExpression.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTArithmeticExpression.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTArithmeticExpression.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTArithmeticFactor.java b/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTArithmeticFactor.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTArithmeticFactor.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTArithmeticFactor.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTArithmeticLiteral.java b/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTArithmeticLiteral.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTArithmeticLiteral.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTArithmeticLiteral.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTArithmeticTerm.java b/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTArithmeticTerm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTArithmeticTerm.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTArithmeticTerm.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTBetweenExpression.java b/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTBetweenExpression.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTBetweenExpression.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTBetweenExpression.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTBooleanExpression.java b/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTBooleanExpression.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTBooleanExpression.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTBooleanExpression.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTBooleanLiteral.java b/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTBooleanLiteral.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTBooleanLiteral.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTBooleanLiteral.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTCmpPathExpression.java b/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTCmpPathExpression.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTCmpPathExpression.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTCmpPathExpression.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTCollectionMemberDeclaration.java b/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTCollectionMemberDeclaration.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTCollectionMemberDeclaration.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTCollectionMemberDeclaration.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTCollectionMemberExpression.java b/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTCollectionMemberExpression.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTCollectionMemberExpression.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTCollectionMemberExpression.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTCollectionValuedPathExpression.java b/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTCollectionValuedPathExpression.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTCollectionValuedPathExpression.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTCollectionValuedPathExpression.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTComparisonExpression.java b/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTComparisonExpression.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTComparisonExpression.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTComparisonExpression.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTConditionalExpression.java b/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTConditionalExpression.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTConditionalExpression.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTConditionalExpression.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTConditionalFactor.java b/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTConditionalFactor.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTConditionalFactor.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTConditionalFactor.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTConditionalTerm.java b/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTConditionalTerm.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTConditionalTerm.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTConditionalTerm.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTDatetimeExpression.java b/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTDatetimeExpression.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTDatetimeExpression.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTDatetimeExpression.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTEJBQL.java b/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTEJBQL.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTEJBQL.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTEJBQL.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTEmptyCollectionComparisonExpression.java b/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTEmptyCollectionComparisonExpression.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTEmptyCollectionComparisonExpression.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTEmptyCollectionComparisonExpression.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTEntityBeanExpression.java b/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTEntityBeanExpression.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTEntityBeanExpression.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTEntityBeanExpression.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTFloatingPointLiteral.java b/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTFloatingPointLiteral.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTFloatingPointLiteral.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTFloatingPointLiteral.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTFromClause.java b/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTFromClause.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTFromClause.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTFromClause.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTFunctionsReturningNumerics.java b/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTFunctionsReturningNumerics.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTFunctionsReturningNumerics.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTFunctionsReturningNumerics.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTFunctionsReturningStrings.java b/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTFunctionsReturningStrings.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTFunctionsReturningStrings.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTFunctionsReturningStrings.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTIdentificationVariable.java b/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTIdentificationVariable.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTIdentificationVariable.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTIdentificationVariable.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTIdentifier.java b/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTIdentifier.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTIdentifier.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTIdentifier.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTInExpression.java b/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTInExpression.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTInExpression.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTInExpression.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTInputParameter.java b/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTInputParameter.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTInputParameter.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTInputParameter.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTIntegerLiteral.java b/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTIntegerLiteral.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTIntegerLiteral.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTIntegerLiteral.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTLikeExpression.java b/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTLikeExpression.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTLikeExpression.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTLikeExpression.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTLimitClause.java b/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTLimitClause.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTLimitClause.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTLimitClause.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTLimitExpression.java b/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTLimitExpression.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTLimitExpression.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTLimitExpression.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTLiteral.java b/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTLiteral.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTLiteral.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTLiteral.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTNullComparisonExpression.java b/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTNullComparisonExpression.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTNullComparisonExpression.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTNullComparisonExpression.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTOrderByClause.java b/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTOrderByClause.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTOrderByClause.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTOrderByClause.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTOrderByItem.java b/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTOrderByItem.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTOrderByItem.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTOrderByItem.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTPath.java b/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTPath.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTPath.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTPath.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTRangeVariableDeclaration.java b/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTRangeVariableDeclaration.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTRangeVariableDeclaration.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTRangeVariableDeclaration.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTSelectClause.java b/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTSelectClause.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTSelectClause.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTSelectClause.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTSelectExpression.java b/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTSelectExpression.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTSelectExpression.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTSelectExpression.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTSingleValuedCmrPathExpression.java b/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTSingleValuedCmrPathExpression.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTSingleValuedCmrPathExpression.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTSingleValuedCmrPathExpression.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTSingleValuedPathExpression.java b/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTSingleValuedPathExpression.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTSingleValuedPathExpression.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTSingleValuedPathExpression.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTStringExpression.java b/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTStringExpression.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTStringExpression.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTStringExpression.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTStringLiteral.java b/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTStringLiteral.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTStringLiteral.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTStringLiteral.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTWhereClause.java b/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTWhereClause.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTWhereClause.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ASTWhereClause.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/EJBQL.java b/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/EJBQL.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/EJBQL.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/EJBQL.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/EJBQL.jjt b/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/EJBQL.jjt similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/EJBQL.jjt rename to jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/EJBQL.jjt diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/EJBQLConstants.java b/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/EJBQLConstants.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/EJBQLConstants.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/EJBQLConstants.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/EJBQLTokenManager.java b/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/EJBQLTokenManager.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/EJBQLTokenManager.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/EJBQLTokenManager.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/EJBQLTreeConstants.java b/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/EJBQLTreeConstants.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/EJBQLTreeConstants.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/EJBQLTreeConstants.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/EJBQLVisitor.java b/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/EJBQLVisitor.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/EJBQLVisitor.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/EJBQLVisitor.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/JJTEJBQLState.java b/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/JJTEJBQLState.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/JJTEJBQLState.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/JJTEJBQLState.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/Node.java b/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/Node.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/Node.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/Node.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ParseException.java b/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ParseException.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ParseException.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/ParseException.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/README b/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/README similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/README rename to jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/README diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/SimpleCharStream.java b/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/SimpleCharStream.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/SimpleCharStream.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/SimpleCharStream.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/SimpleNode.java b/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/SimpleNode.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/SimpleNode.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/SimpleNode.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/Token.java b/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/Token.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/Token.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/Token.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/TokenMgrError.java b/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/TokenMgrError.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/TokenMgrError.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/TokenMgrError.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/bnf_ejbql_2_0.txt b/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/bnf_ejbql_2_0.txt similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/bnf_ejbql_2_0.txt rename to jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/bnf_ejbql_2_0.txt diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/bnf_ejbql_2_1.txt b/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/bnf_ejbql_2_1.txt similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/bnf_ejbql_2_1.txt rename to jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/bnf_ejbql_2_1.txt diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/build.sh b/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/build.sh similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/build.sh rename to jonas/src/org/objectweb/jonas_ejb/deployment/ejbql/build.sh diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/jonas-ejb-jar_2_4.dtd b/jonas/src/org/objectweb/jonas_ejb/deployment/jonas-ejb-jar_2_4.dtd similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/jonas-ejb-jar_2_4.dtd rename to jonas/src/org/objectweb/jonas_ejb/deployment/jonas-ejb-jar_2_4.dtd diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/jonas-ejb-jar_2_5.dtd b/jonas/src/org/objectweb/jonas_ejb/deployment/jonas-ejb-jar_2_5.dtd similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/jonas-ejb-jar_2_5.dtd rename to jonas/src/org/objectweb/jonas_ejb/deployment/jonas-ejb-jar_2_5.dtd diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/jonas-ejb-jar_3_0.dtd b/jonas/src/org/objectweb/jonas_ejb/deployment/jonas-ejb-jar_3_0.dtd similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/jonas-ejb-jar_3_0.dtd rename to jonas/src/org/objectweb/jonas_ejb/deployment/jonas-ejb-jar_3_0.dtd diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/jonas-ejb-jar_3_2.dtd b/jonas/src/org/objectweb/jonas_ejb/deployment/jonas-ejb-jar_3_2.dtd similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/jonas-ejb-jar_3_2.dtd rename to jonas/src/org/objectweb/jonas_ejb/deployment/jonas-ejb-jar_3_2.dtd diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/jonas-ejb-jar_3_2_ws.dtd b/jonas/src/org/objectweb/jonas_ejb/deployment/jonas-ejb-jar_3_2_ws.dtd similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/jonas-ejb-jar_3_2_ws.dtd rename to jonas/src/org/objectweb/jonas_ejb/deployment/jonas-ejb-jar_3_2_ws.dtd diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/jonas-ejb-jar_3_3.dtd b/jonas/src/org/objectweb/jonas_ejb/deployment/jonas-ejb-jar_3_3.dtd similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/jonas-ejb-jar_3_3.dtd rename to jonas/src/org/objectweb/jonas_ejb/deployment/jonas-ejb-jar_3_3.dtd diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/jonas-ejb-jar_3_3_1.dtd b/jonas/src/org/objectweb/jonas_ejb/deployment/jonas-ejb-jar_3_3_1.dtd similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/jonas-ejb-jar_3_3_1.dtd rename to jonas/src/org/objectweb/jonas_ejb/deployment/jonas-ejb-jar_3_3_1.dtd diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/jonas-ejb-jar_3_3_2.dtd b/jonas/src/org/objectweb/jonas_ejb/deployment/jonas-ejb-jar_3_3_2.dtd similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/jonas-ejb-jar_3_3_2.dtd rename to jonas/src/org/objectweb/jonas_ejb/deployment/jonas-ejb-jar_3_3_2.dtd diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/jonas-ejb-jar_4_0.xsd b/jonas/src/org/objectweb/jonas_ejb/deployment/jonas-ejb-jar_4_0.xsd similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/jonas-ejb-jar_4_0.xsd rename to jonas/src/org/objectweb/jonas_ejb/deployment/jonas-ejb-jar_4_0.xsd diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/jonas-ejb-jar_4_1.xsd b/jonas/src/org/objectweb/jonas_ejb/deployment/jonas-ejb-jar_4_1.xsd similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/jonas-ejb-jar_4_1.xsd rename to jonas/src/org/objectweb/jonas_ejb/deployment/jonas-ejb-jar_4_1.xsd diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/jonas-ejb-jar_4_1_2.xsd b/jonas/src/org/objectweb/jonas_ejb/deployment/jonas-ejb-jar_4_1_2.xsd similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/jonas-ejb-jar_4_1_2.xsd rename to jonas/src/org/objectweb/jonas_ejb/deployment/jonas-ejb-jar_4_1_2.xsd diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/jonas-ejb-jar_4_1_4.xsd b/jonas/src/org/objectweb/jonas_ejb/deployment/jonas-ejb-jar_4_1_4.xsd similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/jonas-ejb-jar_4_1_4.xsd rename to jonas/src/org/objectweb/jonas_ejb/deployment/jonas-ejb-jar_4_1_4.xsd diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/jonas-ejb-jar_4_2.xsd b/jonas/src/org/objectweb/jonas_ejb/deployment/jonas-ejb-jar_4_2.xsd similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/jonas-ejb-jar_4_2.xsd rename to jonas/src/org/objectweb/jonas_ejb/deployment/jonas-ejb-jar_4_2.xsd diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/jonas-ejb-jar_4_3.xsd b/jonas/src/org/objectweb/jonas_ejb/deployment/jonas-ejb-jar_4_3.xsd similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/jonas-ejb-jar_4_3.xsd rename to jonas/src/org/objectweb/jonas_ejb/deployment/jonas-ejb-jar_4_3.xsd diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/jonas-ejb-jar_4_6.xsd b/jonas/src/org/objectweb/jonas_ejb/deployment/jonas-ejb-jar_4_6.xsd similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/jonas-ejb-jar_4_6.xsd rename to jonas/src/org/objectweb/jonas_ejb/deployment/jonas-ejb-jar_4_6.xsd diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/jonas-ejb-jar_4_7.xsd b/jonas/src/org/objectweb/jonas_ejb/deployment/jonas-ejb-jar_4_7.xsd similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/jonas-ejb-jar_4_7.xsd rename to jonas/src/org/objectweb/jonas_ejb/deployment/jonas-ejb-jar_4_7.xsd diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/jonas-ejb-jar_4_8.xsd b/jonas/src/org/objectweb/jonas_ejb/deployment/jonas-ejb-jar_4_8.xsd similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/jonas-ejb-jar_4_8.xsd rename to jonas/src/org/objectweb/jonas_ejb/deployment/jonas-ejb-jar_4_8.xsd diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/lib/EjbDeploymentDescManager.java b/jonas/src/org/objectweb/jonas_ejb/deployment/lib/EjbDeploymentDescManager.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/lib/EjbDeploymentDescManager.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/lib/EjbDeploymentDescManager.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/lib/wrapper/EjbManagerWrapper.java b/jonas/src/org/objectweb/jonas_ejb/deployment/lib/wrapper/EjbManagerWrapper.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/lib/wrapper/EjbManagerWrapper.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/lib/wrapper/EjbManagerWrapper.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/rules/ActivationConfigPropertyRuleSet.java b/jonas/src/org/objectweb/jonas_ejb/deployment/rules/ActivationConfigPropertyRuleSet.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/rules/ActivationConfigPropertyRuleSet.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/rules/ActivationConfigPropertyRuleSet.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/rules/ActivationConfigRuleSet.java b/jonas/src/org/objectweb/jonas_ejb/deployment/rules/ActivationConfigRuleSet.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/rules/ActivationConfigRuleSet.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/rules/ActivationConfigRuleSet.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/rules/AsContextRuleSet.java b/jonas/src/org/objectweb/jonas_ejb/deployment/rules/AsContextRuleSet.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/rules/AsContextRuleSet.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/rules/AsContextRuleSet.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/rules/AssemblyDescriptorRuleSet.java b/jonas/src/org/objectweb/jonas_ejb/deployment/rules/AssemblyDescriptorRuleSet.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/rules/AssemblyDescriptorRuleSet.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/rules/AssemblyDescriptorRuleSet.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/rules/CmpFieldJdbcMappingRuleSet.java b/jonas/src/org/objectweb/jonas_ejb/deployment/rules/CmpFieldJdbcMappingRuleSet.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/rules/CmpFieldJdbcMappingRuleSet.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/rules/CmpFieldJdbcMappingRuleSet.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/rules/CmpFieldRuleSet.java b/jonas/src/org/objectweb/jonas_ejb/deployment/rules/CmpFieldRuleSet.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/rules/CmpFieldRuleSet.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/rules/CmpFieldRuleSet.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/rules/CmrFieldRuleSet.java b/jonas/src/org/objectweb/jonas_ejb/deployment/rules/CmrFieldRuleSet.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/rules/CmrFieldRuleSet.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/rules/CmrFieldRuleSet.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/rules/ContainerTransactionRuleSet.java b/jonas/src/org/objectweb/jonas_ejb/deployment/rules/ContainerTransactionRuleSet.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/rules/ContainerTransactionRuleSet.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/rules/ContainerTransactionRuleSet.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/rules/EjbJarRuleSet.java b/jonas/src/org/objectweb/jonas_ejb/deployment/rules/EjbJarRuleSet.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/rules/EjbJarRuleSet.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/rules/EjbJarRuleSet.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/rules/EjbRelationRuleSet.java b/jonas/src/org/objectweb/jonas_ejb/deployment/rules/EjbRelationRuleSet.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/rules/EjbRelationRuleSet.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/rules/EjbRelationRuleSet.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/rules/EjbRelationshipRoleRuleSet.java b/jonas/src/org/objectweb/jonas_ejb/deployment/rules/EjbRelationshipRoleRuleSet.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/rules/EjbRelationshipRoleRuleSet.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/rules/EjbRelationshipRoleRuleSet.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/rules/EnterpriseBeansRuleSet.java b/jonas/src/org/objectweb/jonas_ejb/deployment/rules/EnterpriseBeansRuleSet.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/rules/EnterpriseBeansRuleSet.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/rules/EnterpriseBeansRuleSet.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/rules/EntityRuleSet.java b/jonas/src/org/objectweb/jonas_ejb/deployment/rules/EntityRuleSet.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/rules/EntityRuleSet.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/rules/EntityRuleSet.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/rules/ExcludeListRuleSet.java b/jonas/src/org/objectweb/jonas_ejb/deployment/rules/ExcludeListRuleSet.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/rules/ExcludeListRuleSet.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/rules/ExcludeListRuleSet.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/rules/FinderMethodJdbcMappingRuleSet.java b/jonas/src/org/objectweb/jonas_ejb/deployment/rules/FinderMethodJdbcMappingRuleSet.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/rules/FinderMethodJdbcMappingRuleSet.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/rules/FinderMethodJdbcMappingRuleSet.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/rules/ForeignKeyJdbcMappingRuleSet.java b/jonas/src/org/objectweb/jonas_ejb/deployment/rules/ForeignKeyJdbcMappingRuleSet.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/rules/ForeignKeyJdbcMappingRuleSet.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/rules/ForeignKeyJdbcMappingRuleSet.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/rules/IorSecurityConfigRuleSet.java b/jonas/src/org/objectweb/jonas_ejb/deployment/rules/IorSecurityConfigRuleSet.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/rules/IorSecurityConfigRuleSet.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/rules/IorSecurityConfigRuleSet.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/rules/JdbcMappingRuleSet.java b/jonas/src/org/objectweb/jonas_ejb/deployment/rules/JdbcMappingRuleSet.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/rules/JdbcMappingRuleSet.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/rules/JdbcMappingRuleSet.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/rules/JonasEjbJarRuleSet.java b/jonas/src/org/objectweb/jonas_ejb/deployment/rules/JonasEjbJarRuleSet.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/rules/JonasEjbJarRuleSet.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/rules/JonasEjbJarRuleSet.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/rules/JonasEjbRelationRuleSet.java b/jonas/src/org/objectweb/jonas_ejb/deployment/rules/JonasEjbRelationRuleSet.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/rules/JonasEjbRelationRuleSet.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/rules/JonasEjbRelationRuleSet.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/rules/JonasEjbRelationshipRoleRuleSet.java b/jonas/src/org/objectweb/jonas_ejb/deployment/rules/JonasEjbRelationshipRoleRuleSet.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/rules/JonasEjbRelationshipRoleRuleSet.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/rules/JonasEjbRelationshipRoleRuleSet.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/rules/JonasEntityRuleSet.java b/jonas/src/org/objectweb/jonas_ejb/deployment/rules/JonasEntityRuleSet.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/rules/JonasEntityRuleSet.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/rules/JonasEntityRuleSet.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/rules/JonasInitParamRuleSet.java b/jonas/src/org/objectweb/jonas_ejb/deployment/rules/JonasInitParamRuleSet.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/rules/JonasInitParamRuleSet.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/rules/JonasInitParamRuleSet.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/rules/JonasMessageDrivenDestinationRuleSet.java b/jonas/src/org/objectweb/jonas_ejb/deployment/rules/JonasMessageDrivenDestinationRuleSet.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/rules/JonasMessageDrivenDestinationRuleSet.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/rules/JonasMessageDrivenDestinationRuleSet.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/rules/JonasMessageDrivenRuleSet.java b/jonas/src/org/objectweb/jonas_ejb/deployment/rules/JonasMessageDrivenRuleSet.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/rules/JonasMessageDrivenRuleSet.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/rules/JonasMessageDrivenRuleSet.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/rules/JonasMethodRuleSet.java b/jonas/src/org/objectweb/jonas_ejb/deployment/rules/JonasMethodRuleSet.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/rules/JonasMethodRuleSet.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/rules/JonasMethodRuleSet.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/rules/JonasRunAsMappingRuleSet.java b/jonas/src/org/objectweb/jonas_ejb/deployment/rules/JonasRunAsMappingRuleSet.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/rules/JonasRunAsMappingRuleSet.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/rules/JonasRunAsMappingRuleSet.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/rules/JonasSessionRuleSet.java b/jonas/src/org/objectweb/jonas_ejb/deployment/rules/JonasSessionRuleSet.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/rules/JonasSessionRuleSet.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/rules/JonasSessionRuleSet.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/rules/MessageDrivenDestinationRuleSet.java b/jonas/src/org/objectweb/jonas_ejb/deployment/rules/MessageDrivenDestinationRuleSet.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/rules/MessageDrivenDestinationRuleSet.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/rules/MessageDrivenDestinationRuleSet.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/rules/MessageDrivenRuleSet.java b/jonas/src/org/objectweb/jonas_ejb/deployment/rules/MessageDrivenRuleSet.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/rules/MessageDrivenRuleSet.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/rules/MessageDrivenRuleSet.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/rules/MethodParamsRuleSet.java b/jonas/src/org/objectweb/jonas_ejb/deployment/rules/MethodParamsRuleSet.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/rules/MethodParamsRuleSet.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/rules/MethodParamsRuleSet.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/rules/MethodPermissionRuleSet.java b/jonas/src/org/objectweb/jonas_ejb/deployment/rules/MethodPermissionRuleSet.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/rules/MethodPermissionRuleSet.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/rules/MethodPermissionRuleSet.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/rules/MethodRuleSet.java b/jonas/src/org/objectweb/jonas_ejb/deployment/rules/MethodRuleSet.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/rules/MethodRuleSet.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/rules/MethodRuleSet.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/rules/QueryMethodRuleSet.java b/jonas/src/org/objectweb/jonas_ejb/deployment/rules/QueryMethodRuleSet.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/rules/QueryMethodRuleSet.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/rules/QueryMethodRuleSet.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/rules/QueryRuleSet.java b/jonas/src/org/objectweb/jonas_ejb/deployment/rules/QueryRuleSet.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/rules/QueryRuleSet.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/rules/QueryRuleSet.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/rules/RelationshipRoleSourceRuleSet.java b/jonas/src/org/objectweb/jonas_ejb/deployment/rules/RelationshipRoleSourceRuleSet.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/rules/RelationshipRoleSourceRuleSet.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/rules/RelationshipRoleSourceRuleSet.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/rules/RelationshipsRuleSet.java b/jonas/src/org/objectweb/jonas_ejb/deployment/rules/RelationshipsRuleSet.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/rules/RelationshipsRuleSet.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/rules/RelationshipsRuleSet.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/rules/SasContextRuleSet.java b/jonas/src/org/objectweb/jonas_ejb/deployment/rules/SasContextRuleSet.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/rules/SasContextRuleSet.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/rules/SasContextRuleSet.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/rules/SecurityIdentityRuleSet.java b/jonas/src/org/objectweb/jonas_ejb/deployment/rules/SecurityIdentityRuleSet.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/rules/SecurityIdentityRuleSet.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/rules/SecurityIdentityRuleSet.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/rules/SessionRuleSet.java b/jonas/src/org/objectweb/jonas_ejb/deployment/rules/SessionRuleSet.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/rules/SessionRuleSet.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/rules/SessionRuleSet.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/rules/TransportConfigRuleSet.java b/jonas/src/org/objectweb/jonas_ejb/deployment/rules/TransportConfigRuleSet.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/rules/TransportConfigRuleSet.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/rules/TransportConfigRuleSet.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/rules/UseCallerIdentityRuleSet.java b/jonas/src/org/objectweb/jonas_ejb/deployment/rules/UseCallerIdentityRuleSet.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/rules/UseCallerIdentityRuleSet.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/rules/UseCallerIdentityRuleSet.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/tests/EJBDeploymentTest.java b/jonas/src/org/objectweb/jonas_ejb/deployment/tests/EJBDeploymentTest.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/tests/EJBDeploymentTest.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/tests/EJBDeploymentTest.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/tests/JonasEJBDeploymentTest.java b/jonas/src/org/objectweb/jonas_ejb/deployment/tests/JonasEJBDeploymentTest.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/tests/JonasEJBDeploymentTest.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/tests/JonasEJBDeploymentTest.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/xml/ActivationConfig.java b/jonas/src/org/objectweb/jonas_ejb/deployment/xml/ActivationConfig.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/xml/ActivationConfig.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/xml/ActivationConfig.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/xml/ActivationConfigProperty.java b/jonas/src/org/objectweb/jonas_ejb/deployment/xml/ActivationConfigProperty.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/xml/ActivationConfigProperty.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/xml/ActivationConfigProperty.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/xml/AsContextMapping.java b/jonas/src/org/objectweb/jonas_ejb/deployment/xml/AsContextMapping.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/xml/AsContextMapping.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/xml/AsContextMapping.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/xml/AssemblyDescriptor.java b/jonas/src/org/objectweb/jonas_ejb/deployment/xml/AssemblyDescriptor.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/xml/AssemblyDescriptor.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/xml/AssemblyDescriptor.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/xml/CmpField.java b/jonas/src/org/objectweb/jonas_ejb/deployment/xml/CmpField.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/xml/CmpField.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/xml/CmpField.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/xml/CmpFieldJdbcMapping.java b/jonas/src/org/objectweb/jonas_ejb/deployment/xml/CmpFieldJdbcMapping.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/xml/CmpFieldJdbcMapping.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/xml/CmpFieldJdbcMapping.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/xml/CmrField.java b/jonas/src/org/objectweb/jonas_ejb/deployment/xml/CmrField.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/xml/CmrField.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/xml/CmrField.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/xml/CommonEjb.java b/jonas/src/org/objectweb/jonas_ejb/deployment/xml/CommonEjb.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/xml/CommonEjb.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/xml/CommonEjb.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/xml/CommonEjbXml.java b/jonas/src/org/objectweb/jonas_ejb/deployment/xml/CommonEjbXml.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/xml/CommonEjbXml.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/xml/CommonEjbXml.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/xml/ContainerTransaction.java b/jonas/src/org/objectweb/jonas_ejb/deployment/xml/ContainerTransaction.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/xml/ContainerTransaction.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/xml/ContainerTransaction.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/xml/EjbJar.java b/jonas/src/org/objectweb/jonas_ejb/deployment/xml/EjbJar.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/xml/EjbJar.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/xml/EjbJar.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/xml/EjbRelation.java b/jonas/src/org/objectweb/jonas_ejb/deployment/xml/EjbRelation.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/xml/EjbRelation.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/xml/EjbRelation.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/xml/EjbRelationshipRole.java b/jonas/src/org/objectweb/jonas_ejb/deployment/xml/EjbRelationshipRole.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/xml/EjbRelationshipRole.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/xml/EjbRelationshipRole.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/xml/EnterpriseBeans.java b/jonas/src/org/objectweb/jonas_ejb/deployment/xml/EnterpriseBeans.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/xml/EnterpriseBeans.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/xml/EnterpriseBeans.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/xml/Entity.java b/jonas/src/org/objectweb/jonas_ejb/deployment/xml/Entity.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/xml/Entity.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/xml/Entity.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/xml/ExcludeList.java b/jonas/src/org/objectweb/jonas_ejb/deployment/xml/ExcludeList.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/xml/ExcludeList.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/xml/ExcludeList.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/xml/FinderMethodJdbcMapping.java b/jonas/src/org/objectweb/jonas_ejb/deployment/xml/FinderMethodJdbcMapping.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/xml/FinderMethodJdbcMapping.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/xml/FinderMethodJdbcMapping.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/xml/ForeignKeyJdbcMapping.java b/jonas/src/org/objectweb/jonas_ejb/deployment/xml/ForeignKeyJdbcMapping.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/xml/ForeignKeyJdbcMapping.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/xml/ForeignKeyJdbcMapping.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/xml/IorSecurityConfigMapping.java b/jonas/src/org/objectweb/jonas_ejb/deployment/xml/IorSecurityConfigMapping.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/xml/IorSecurityConfigMapping.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/xml/IorSecurityConfigMapping.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/xml/JdbcMapping.java b/jonas/src/org/objectweb/jonas_ejb/deployment/xml/JdbcMapping.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/xml/JdbcMapping.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/xml/JdbcMapping.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/xml/JonasCommonEjb.java b/jonas/src/org/objectweb/jonas_ejb/deployment/xml/JonasCommonEjb.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/xml/JonasCommonEjb.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/xml/JonasCommonEjb.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/xml/JonasCommonEjbXml.java b/jonas/src/org/objectweb/jonas_ejb/deployment/xml/JonasCommonEjbXml.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/xml/JonasCommonEjbXml.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/xml/JonasCommonEjbXml.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/xml/JonasEjbJar.java b/jonas/src/org/objectweb/jonas_ejb/deployment/xml/JonasEjbJar.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/xml/JonasEjbJar.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/xml/JonasEjbJar.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/xml/JonasEjbRelation.java b/jonas/src/org/objectweb/jonas_ejb/deployment/xml/JonasEjbRelation.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/xml/JonasEjbRelation.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/xml/JonasEjbRelation.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/xml/JonasEjbRelationshipRole.java b/jonas/src/org/objectweb/jonas_ejb/deployment/xml/JonasEjbRelationshipRole.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/xml/JonasEjbRelationshipRole.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/xml/JonasEjbRelationshipRole.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/xml/JonasEntity.java b/jonas/src/org/objectweb/jonas_ejb/deployment/xml/JonasEntity.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/xml/JonasEntity.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/xml/JonasEntity.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/xml/JonasInitParam.java b/jonas/src/org/objectweb/jonas_ejb/deployment/xml/JonasInitParam.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/xml/JonasInitParam.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/xml/JonasInitParam.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/xml/JonasMessageDriven.java b/jonas/src/org/objectweb/jonas_ejb/deployment/xml/JonasMessageDriven.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/xml/JonasMessageDriven.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/xml/JonasMessageDriven.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/xml/JonasMessageDrivenDestination.java b/jonas/src/org/objectweb/jonas_ejb/deployment/xml/JonasMessageDrivenDestination.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/xml/JonasMessageDrivenDestination.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/xml/JonasMessageDrivenDestination.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/xml/JonasMethod.java b/jonas/src/org/objectweb/jonas_ejb/deployment/xml/JonasMethod.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/xml/JonasMethod.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/xml/JonasMethod.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/xml/JonasRunAsMapping.java b/jonas/src/org/objectweb/jonas_ejb/deployment/xml/JonasRunAsMapping.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/xml/JonasRunAsMapping.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/xml/JonasRunAsMapping.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/xml/JonasSession.java b/jonas/src/org/objectweb/jonas_ejb/deployment/xml/JonasSession.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/xml/JonasSession.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/xml/JonasSession.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/xml/MessageDriven.java b/jonas/src/org/objectweb/jonas_ejb/deployment/xml/MessageDriven.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/xml/MessageDriven.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/xml/MessageDriven.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/xml/MessageDrivenDestination.java b/jonas/src/org/objectweb/jonas_ejb/deployment/xml/MessageDrivenDestination.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/xml/MessageDrivenDestination.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/xml/MessageDrivenDestination.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/xml/Method.java b/jonas/src/org/objectweb/jonas_ejb/deployment/xml/Method.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/xml/Method.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/xml/Method.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/xml/MethodParams.java b/jonas/src/org/objectweb/jonas_ejb/deployment/xml/MethodParams.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/xml/MethodParams.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/xml/MethodParams.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/xml/MethodPermission.java b/jonas/src/org/objectweb/jonas_ejb/deployment/xml/MethodPermission.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/xml/MethodPermission.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/xml/MethodPermission.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/xml/Query.java b/jonas/src/org/objectweb/jonas_ejb/deployment/xml/Query.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/xml/Query.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/xml/Query.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/xml/QueryMethod.java b/jonas/src/org/objectweb/jonas_ejb/deployment/xml/QueryMethod.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/xml/QueryMethod.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/xml/QueryMethod.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/xml/RelationshipRoleSource.java b/jonas/src/org/objectweb/jonas_ejb/deployment/xml/RelationshipRoleSource.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/xml/RelationshipRoleSource.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/xml/RelationshipRoleSource.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/xml/Relationships.java b/jonas/src/org/objectweb/jonas_ejb/deployment/xml/Relationships.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/xml/Relationships.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/xml/Relationships.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/xml/SasContextMapping.java b/jonas/src/org/objectweb/jonas_ejb/deployment/xml/SasContextMapping.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/xml/SasContextMapping.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/xml/SasContextMapping.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/xml/SecurityIdentity.java b/jonas/src/org/objectweb/jonas_ejb/deployment/xml/SecurityIdentity.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/xml/SecurityIdentity.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/xml/SecurityIdentity.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/xml/Session.java b/jonas/src/org/objectweb/jonas_ejb/deployment/xml/Session.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/xml/Session.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/xml/Session.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/xml/TransportConfigMapping.java b/jonas/src/org/objectweb/jonas_ejb/deployment/xml/TransportConfigMapping.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/xml/TransportConfigMapping.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/xml/TransportConfigMapping.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/deployment/xml/UseCallerIdentity.java b/jonas/src/org/objectweb/jonas_ejb/deployment/xml/UseCallerIdentity.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/deployment/xml/UseCallerIdentity.java rename to jonas/src/org/objectweb/jonas_ejb/deployment/xml/UseCallerIdentity.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/genic/BeanSources.java b/jonas/src/org/objectweb/jonas_ejb/genic/BeanSources.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/genic/BeanSources.java rename to jonas/src/org/objectweb/jonas_ejb/genic/BeanSources.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/genic/ClusterHomeDistributor.vm b/jonas/src/org/objectweb/jonas_ejb/genic/ClusterHomeDistributor.vm similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/genic/ClusterHomeDistributor.vm rename to jonas/src/org/objectweb/jonas_ejb/genic/ClusterHomeDistributor.vm diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/genic/ClusterHomeEntityRepDistributor.vm b/jonas/src/org/objectweb/jonas_ejb/genic/ClusterHomeEntityRepDistributor.vm similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/genic/ClusterHomeEntityRepDistributor.vm rename to jonas/src/org/objectweb/jonas_ejb/genic/ClusterHomeEntityRepDistributor.vm diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/genic/ClusterHomeRRDistributor.vm b/jonas/src/org/objectweb/jonas_ejb/genic/ClusterHomeRRDistributor.vm similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/genic/ClusterHomeRRDistributor.vm rename to jonas/src/org/objectweb/jonas_ejb/genic/ClusterHomeRRDistributor.vm diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/genic/ClusterHomeSFSBRepDistributor.vm b/jonas/src/org/objectweb/jonas_ejb/genic/ClusterHomeSFSBRepDistributor.vm similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/genic/ClusterHomeSFSBRepDistributor.vm rename to jonas/src/org/objectweb/jonas_ejb/genic/ClusterHomeSFSBRepDistributor.vm diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/genic/ClusterHomeSLSBRepDistributor.vm b/jonas/src/org/objectweb/jonas_ejb/genic/ClusterHomeSLSBRepDistributor.vm similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/genic/ClusterHomeSLSBRepDistributor.vm rename to jonas/src/org/objectweb/jonas_ejb/genic/ClusterHomeSLSBRepDistributor.vm diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/genic/ClusterRemoteEntityRepDistributor.vm b/jonas/src/org/objectweb/jonas_ejb/genic/ClusterRemoteEntityRepDistributor.vm similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/genic/ClusterRemoteEntityRepDistributor.vm rename to jonas/src/org/objectweb/jonas_ejb/genic/ClusterRemoteEntityRepDistributor.vm diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/genic/ClusterRemoteRRDistributor.vm b/jonas/src/org/objectweb/jonas_ejb/genic/ClusterRemoteRRDistributor.vm similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/genic/ClusterRemoteRRDistributor.vm rename to jonas/src/org/objectweb/jonas_ejb/genic/ClusterRemoteRRDistributor.vm diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/genic/ClusterRemoteSFSBRepDistributor.vm b/jonas/src/org/objectweb/jonas_ejb/genic/ClusterRemoteSFSBRepDistributor.vm similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/genic/ClusterRemoteSFSBRepDistributor.vm rename to jonas/src/org/objectweb/jonas_ejb/genic/ClusterRemoteSFSBRepDistributor.vm diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/genic/ClusterRemoteSLSBDistributor.vm b/jonas/src/org/objectweb/jonas_ejb/genic/ClusterRemoteSLSBDistributor.vm similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/genic/ClusterRemoteSLSBDistributor.vm rename to jonas/src/org/objectweb/jonas_ejb/genic/ClusterRemoteSLSBDistributor.vm diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/genic/ClusterRemoteSLSBRepDistributor.vm b/jonas/src/org/objectweb/jonas_ejb/genic/ClusterRemoteSLSBRepDistributor.vm similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/genic/ClusterRemoteSLSBRepDistributor.vm rename to jonas/src/org/objectweb/jonas_ejb/genic/ClusterRemoteSLSBRepDistributor.vm diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/genic/GenIC.bat b/jonas/src/org/objectweb/jonas_ejb/genic/GenIC.bat similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/genic/GenIC.bat rename to jonas/src/org/objectweb/jonas_ejb/genic/GenIC.bat diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/genic/GenIC.java b/jonas/src/org/objectweb/jonas_ejb/genic/GenIC.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/genic/GenIC.java rename to jonas/src/org/objectweb/jonas_ejb/genic/GenIC.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/genic/GenIC.sh b/jonas/src/org/objectweb/jonas_ejb/genic/GenIC.sh similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/genic/GenIC.sh rename to jonas/src/org/objectweb/jonas_ejb/genic/GenIC.sh diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/genic/GenICException.java b/jonas/src/org/objectweb/jonas_ejb/genic/GenICException.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/genic/GenICException.java rename to jonas/src/org/objectweb/jonas_ejb/genic/GenICException.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/genic/GenICMacros.vm b/jonas/src/org/objectweb/jonas_ejb/genic/GenICMacros.vm similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/genic/GenICMacros.vm rename to jonas/src/org/objectweb/jonas_ejb/genic/GenICMacros.vm diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/genic/GenICParameters.java b/jonas/src/org/objectweb/jonas_ejb/genic/GenICParameters.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/genic/GenICParameters.java rename to jonas/src/org/objectweb/jonas_ejb/genic/GenICParameters.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/genic/JEntityCmp2.vm b/jonas/src/org/objectweb/jonas_ejb/genic/JEntityCmp2.vm similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/genic/JEntityCmp2.vm rename to jonas/src/org/objectweb/jonas_ejb/genic/JEntityCmp2.vm diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/genic/JEntityCmp2CoherenceItf.vm b/jonas/src/org/objectweb/jonas_ejb/genic/JEntityCmp2CoherenceItf.vm similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/genic/JEntityCmp2CoherenceItf.vm rename to jonas/src/org/objectweb/jonas_ejb/genic/JEntityCmp2CoherenceItf.vm diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/genic/JEntityCmpJdbc.vm b/jonas/src/org/objectweb/jonas_ejb/genic/JEntityCmpJdbc.vm similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/genic/JEntityCmpJdbc.vm rename to jonas/src/org/objectweb/jonas_ejb/genic/JEntityCmpJdbc.vm diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/genic/JEntityHandle.vm b/jonas/src/org/objectweb/jonas_ejb/genic/JEntityHandle.vm similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/genic/JEntityHandle.vm rename to jonas/src/org/objectweb/jonas_ejb/genic/JEntityHandle.vm diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/genic/JEntityHome.vm b/jonas/src/org/objectweb/jonas_ejb/genic/JEntityHome.vm similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/genic/JEntityHome.vm rename to jonas/src/org/objectweb/jonas_ejb/genic/JEntityHome.vm diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/genic/JEntityLocal.vm b/jonas/src/org/objectweb/jonas_ejb/genic/JEntityLocal.vm similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/genic/JEntityLocal.vm rename to jonas/src/org/objectweb/jonas_ejb/genic/JEntityLocal.vm diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/genic/JEntityLocalHome.vm b/jonas/src/org/objectweb/jonas_ejb/genic/JEntityLocalHome.vm similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/genic/JEntityLocalHome.vm rename to jonas/src/org/objectweb/jonas_ejb/genic/JEntityLocalHome.vm diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/genic/JEntityRemote.vm b/jonas/src/org/objectweb/jonas_ejb/genic/JEntityRemote.vm similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/genic/JEntityRemote.vm rename to jonas/src/org/objectweb/jonas_ejb/genic/JEntityRemote.vm diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/genic/JServiceEndpoint.vm b/jonas/src/org/objectweb/jonas_ejb/genic/JServiceEndpoint.vm similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/genic/JServiceEndpoint.vm rename to jonas/src/org/objectweb/jonas_ejb/genic/JServiceEndpoint.vm diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/genic/JServiceEndpointHome.vm b/jonas/src/org/objectweb/jonas_ejb/genic/JServiceEndpointHome.vm similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/genic/JServiceEndpointHome.vm rename to jonas/src/org/objectweb/jonas_ejb/genic/JServiceEndpointHome.vm diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/genic/JStatefulHome.vm b/jonas/src/org/objectweb/jonas_ejb/genic/JStatefulHome.vm similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/genic/JStatefulHome.vm rename to jonas/src/org/objectweb/jonas_ejb/genic/JStatefulHome.vm diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/genic/JStatefulLocal.vm b/jonas/src/org/objectweb/jonas_ejb/genic/JStatefulLocal.vm similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/genic/JStatefulLocal.vm rename to jonas/src/org/objectweb/jonas_ejb/genic/JStatefulLocal.vm diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/genic/JStatefulLocalHome.vm b/jonas/src/org/objectweb/jonas_ejb/genic/JStatefulLocalHome.vm similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/genic/JStatefulLocalHome.vm rename to jonas/src/org/objectweb/jonas_ejb/genic/JStatefulLocalHome.vm diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/genic/JStatefulRemote.vm b/jonas/src/org/objectweb/jonas_ejb/genic/JStatefulRemote.vm similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/genic/JStatefulRemote.vm rename to jonas/src/org/objectweb/jonas_ejb/genic/JStatefulRemote.vm diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/genic/JStatelessHome.vm b/jonas/src/org/objectweb/jonas_ejb/genic/JStatelessHome.vm similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/genic/JStatelessHome.vm rename to jonas/src/org/objectweb/jonas_ejb/genic/JStatelessHome.vm diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/genic/JStatelessLocal.vm b/jonas/src/org/objectweb/jonas_ejb/genic/JStatelessLocal.vm similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/genic/JStatelessLocal.vm rename to jonas/src/org/objectweb/jonas_ejb/genic/JStatelessLocal.vm diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/genic/JStatelessLocalHome.vm b/jonas/src/org/objectweb/jonas_ejb/genic/JStatelessLocalHome.vm similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/genic/JStatelessLocalHome.vm rename to jonas/src/org/objectweb/jonas_ejb/genic/JStatelessLocalHome.vm diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/genic/JStatelessRemote.vm b/jonas/src/org/objectweb/jonas_ejb/genic/JStatelessRemote.vm similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/genic/JStatelessRemote.vm rename to jonas/src/org/objectweb/jonas_ejb/genic/JStatelessRemote.vm diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/genic/README b/jonas/src/org/objectweb/jonas_ejb/genic/README similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/genic/README rename to jonas/src/org/objectweb/jonas_ejb/genic/README diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/genic/Source.java b/jonas/src/org/objectweb/jonas_ejb/genic/Source.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/genic/Source.java rename to jonas/src/org/objectweb/jonas_ejb/genic/Source.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/genic/VContextFactory.java b/jonas/src/org/objectweb/jonas_ejb/genic/VContextFactory.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/genic/VContextFactory.java rename to jonas/src/org/objectweb/jonas_ejb/genic/VContextFactory.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/genic/VcCMRField.java b/jonas/src/org/objectweb/jonas_ejb/genic/VcCMRField.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/genic/VcCMRField.java rename to jonas/src/org/objectweb/jonas_ejb/genic/VcCMRField.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/genic/VcField.java b/jonas/src/org/objectweb/jonas_ejb/genic/VcField.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/genic/VcField.java rename to jonas/src/org/objectweb/jonas_ejb/genic/VcField.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/genic/VcMethod.java b/jonas/src/org/objectweb/jonas_ejb/genic/VcMethod.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/genic/VcMethod.java rename to jonas/src/org/objectweb/jonas_ejb/genic/VcMethod.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/genic/VcParam.java b/jonas/src/org/objectweb/jonas_ejb/genic/VcParam.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/genic/VcParam.java rename to jonas/src/org/objectweb/jonas_ejb/genic/VcParam.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/genic/VcParamWhere.java b/jonas/src/org/objectweb/jonas_ejb/genic/VcParamWhere.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/genic/VcParamWhere.java rename to jonas/src/org/objectweb/jonas_ejb/genic/VcParamWhere.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/genic/wrapper/GenicServiceWrapper.java b/jonas/src/org/objectweb/jonas_ejb/genic/wrapper/GenicServiceWrapper.java similarity index 100% rename from jonas/jonas/src/org/objectweb/jonas_ejb/genic/wrapper/GenicServiceWrapper.java rename to jonas/src/org/objectweb/jonas_ejb/genic/wrapper/GenicServiceWrapper.java diff --git a/jonas/jonas/src/org/objectweb/jonas_ejb/genidl/GenIDL.java b/jonas/src/org