# HG changeset patch
# User Jesse Glick <jglick@netbeans.org>
# Date 1260499415 18000
Issue #178426: Replace <schema2beans> with annotation processor.
To support this, enhance harness & apisupport to handle generated sources.

diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -96,19 +96,13 @@
 ^installer/packages/ubuntu/netbeans-5.5/nb55-jumbodocpack\.zip$
 ^installer/packages/ubuntu/netbeans-5.5/netbeans-5_5_1-javadoc\.tar\.gz$
 ^installer/profiler/customcode/lib$
-^j2ee.*\.dd.*/src/.+/impl/.+/model(_[0-9]+)*$
-^j2ee.*\.dd.*/src/.+/impl/.+/model(_[0-9]+)*_frag$
+^j2ee\.dd/src/.+/impl/.+/model(_[0-9]+)*(_frag)?$
 ^j2ee.dd/test/unit/data/web\.xml$
 ^j2ee.dd/test/unit/data/web\.diff$
 ^j2ee.dd/test/unit/data/invalid/web\.xml$
 ^j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/wizards/dd/\.ApplicationXmlVisualPanel1\.java\.swp$
-^j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/gen$
-^j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/dd/.+/model_1_0$
-^j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/dd/.+/model_2_0$
 ^j2ee.toplinklib/external/toplink$
 ^j2eeserver/\.swp$
-^j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/spi/gen$
-^j2eeserver/src/org/netbeans/modules/j2ee/deployment/impl/gen$
 ^java.editor/test/unit/src/org/netbeans/modules/editor/java/data/.*\.jar$
 ^java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_template\.html$
 ^java.navigation/test/run\.sh$
@@ -188,10 +182,6 @@
 ^o.jruby.distro/unpatched_source$
 ^o.jruby/patched_source$
 ^o.mozilla.rhino.patched/patched_source$
-^schema2beans/anttask/s2banttask\.jar$
-^schema2beans/dev/schema2beansdev\.jar$
-^schema2beans/dev/manifest-subst\.mf$
-^j2ee.jboss4/src/org/netbeans/modules/j2ee/jboss4/config/gen$
 ^j2ee.sun.appsrv81/\.keystore$
 ^j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/verifier$
 ^j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/serverresources/model$
@@ -265,9 +255,6 @@
 ^xml.tools/test/qa-functional/src/org/netbeans/modules/xsl/action/data/out/document\.html$
 ^xml.xdm/test/\.build\.xml\.swp$
 ^nbjunit/nbjunit-.*$
-^hibernate/src/org/netbeans/modules/hibernate/mapping/model$
-^hibernate/src/org/netbeans/modules/hibernate/cfg/model$
-^hibernate/src/org/netbeans/modules/hibernate/reveng/model$
 ^hibernate/test/unit/data/db-derby-10\.2\.2\.0-bin$
 \.orig\..*$
 \.chg\..*$
diff --git a/apisupport.project/src/org/netbeans/modules/apisupport/project/NbModuleProject.java b/apisupport.project/src/org/netbeans/modules/apisupport/project/NbModuleProject.java
--- a/apisupport.project/src/org/netbeans/modules/apisupport/project/NbModuleProject.java
+++ b/apisupport.project/src/org/netbeans/modules/apisupport/project/NbModuleProject.java
@@ -426,6 +426,18 @@
         String testClassesDir = evaluator().getProperty("build.test." + type + ".classes.dir"); // NOI18N
         return testClassesDir != null ? helper.resolveFile(testClassesDir) : null;
     }
+
+    public File getGeneratedClassesDirectory() {
+        return gensrc(getClassesDirectory());
+    }
+
+    public File getTestGeneratedClassesDirectory(String type) {
+        return gensrc(getTestClassesDirectory(type));
+    }
+
+    private File gensrc(File clazz) {
+        return new File(clazz.getParentFile(), clazz.getName() + "-generated"); // NOI18N
+    }
     
     public FileObject getJavaHelpDirectory() {
         if (helper.resolveFileObject("javahelp/manifest.mf") != null) { // NOI18N
diff --git a/apisupport.project/src/org/netbeans/modules/apisupport/project/queries/ClassPathProviderImpl.java b/apisupport.project/src/org/netbeans/modules/apisupport/project/queries/ClassPathProviderImpl.java
--- a/apisupport.project/src/org/netbeans/modules/apisupport/project/queries/ClassPathProviderImpl.java
+++ b/apisupport.project/src/org/netbeans/modules/apisupport/project/queries/ClassPathProviderImpl.java
@@ -118,7 +118,18 @@
         dir = dir == null ? null : FileUtil.normalizeFile(dir);
         FileObject testClassesDir = (dir == null || ! dir.exists()) ? null : FileUtil.toFileObject(dir);
         File moduleJar;
-        if (srcDir != null && (FileUtil.isParentOf(srcDir, file) || file == srcDir)) {
+        URL generatedClasses = FileUtil.urlForArchiveOrDir(project.getGeneratedClassesDirectory());
+        URL generatedUnitTestClasses = FileUtil.urlForArchiveOrDir(project.getTestGeneratedClassesDirectory("unit"));
+        URL generatedFunctionalTestClasses = FileUtil.urlForArchiveOrDir(project.getTestGeneratedClassesDirectory("qa-functional"));
+        String fileU;
+        try {
+            fileU = file.getURL().toString();
+        } catch (FileStateInvalidException x) {
+            LOG.log(Level.INFO, null, x);
+            return null;
+        }
+        if (srcDir != null &&
+                (FileUtil.isParentOf(srcDir, file) || file == srcDir || fileU.startsWith(generatedClasses.toString()))) {
             // Regular sources.
             if (type.equals(ClassPath.COMPILE)) {
                 if (compile == null) {
@@ -133,11 +144,16 @@
                 return execute;
             } else if (type.equals(ClassPath.SOURCE)) {
                 if (source == null) {
-                    source = ClassPathSupport.createClassPath(new FileObject[] {srcDir});
+                    try {
+                        source = ClassPathSupport.createClassPath(srcDir.getURL(), generatedClasses);
+                    } catch (FileStateInvalidException x) {
+                        LOG.log(Level.INFO, null, x);
+                    }
                 }
                 return source;
             }
-        } else if (testSrcDir != null && (FileUtil.isParentOf(testSrcDir, file) || file == testSrcDir)) {
+        } else if (testSrcDir != null &&
+                (FileUtil.isParentOf(testSrcDir, file) || file == testSrcDir || fileU.startsWith(generatedUnitTestClasses.toString()))) {
             // Unit tests.
             // XXX refactor to use project.supportedTestTypes
             if (type.equals(ClassPath.COMPILE)) {
@@ -154,15 +170,24 @@
                 return testExecute;
             } else if (type.equals(ClassPath.SOURCE)) {
                 if (testSource == null) {
-                    testSource = ClassPathSupport.createClassPath(new FileObject[] {testSrcDir});
+                    try {
+                        testSource = ClassPathSupport.createClassPath(testSrcDir.getURL(), generatedUnitTestClasses);
+                    } catch (FileStateInvalidException x) {
+                        LOG.log(Level.INFO, null, x);
+                    }
                 }
                 return testSource;
             }
-        } else if (funcTestSrcDir != null && (FileUtil.isParentOf(funcTestSrcDir, file) || file == funcTestSrcDir)) {
+        } else if (funcTestSrcDir != null &&
+                (FileUtil.isParentOf(funcTestSrcDir, file) || file == funcTestSrcDir || fileU.startsWith(generatedFunctionalTestClasses.toString()))) {
             // Functional tests.
             if (type.equals(ClassPath.SOURCE)) {
                 if (funcTestSource == null) {
-                    funcTestSource = ClassPathSupport.createClassPath(new FileObject[] {funcTestSrcDir});
+                    try {
+                        funcTestSource = ClassPathSupport.createClassPath(funcTestSrcDir.getURL(), generatedFunctionalTestClasses);
+                    } catch (FileStateInvalidException x) {
+                        LOG.log(Level.INFO, null, x);
+                    }
                 }
                 return funcTestSource;
             } else if (type.equals(ClassPath.COMPILE)) {
diff --git a/apisupport.project/src/org/netbeans/modules/apisupport/project/queries/SourceForBinaryImpl.java b/apisupport.project/src/org/netbeans/modules/apisupport/project/queries/SourceForBinaryImpl.java
--- a/apisupport.project/src/org/netbeans/modules/apisupport/project/queries/SourceForBinaryImpl.java
+++ b/apisupport.project/src/org/netbeans/modules/apisupport/project/queries/SourceForBinaryImpl.java
@@ -78,13 +78,17 @@
             File binaryJarF = FileUtil.archiveOrDirForURL(binaryRoot);
             if (binaryJarF != null) {
                 FileObject srcDir = null;
+                File genSrcDirF = null;
                 if (binaryJarF.getAbsolutePath().endsWith(project.evaluator().getProperty("module.jar").replace('/', File.separatorChar))) {
                     srcDir = project.getSourceDirectory();
+                    genSrcDirF = project.getGeneratedClassesDirectory();
                 } else {
                     // maybe tests.jar in testdistribution
                     TestEntry entry = TestEntry.get(binaryJarF);
                     if (entry != null && project.getCodeNameBase().equals(entry.getCodeNameBase())) {
-                        srcDir = project.getTestSourceDirectory(entry.getTestType());
+                        String type = entry.getTestType();
+                        srcDir = project.getTestSourceDirectory(type);
+                        genSrcDirF = project.getTestGeneratedClassesDirectory(type);
                     } else {
                         // try classpath-extension
                         // // convention-over-cfg per mkleint's suggestion: <jarname>-src(.zip) folder or ZIP first
@@ -94,13 +98,13 @@
                             File jFolder = new File(binaryJarF.getParentFile(),
                                     n.substring(0, n.length() - ".jar".length()) + "-src");
                             if (jFolder.isDirectory()) {
-                                res = new Result(FileUtil.toFileObject(jFolder));
+                                res = new Result(FileUtil.toFileObject(jFolder), null);
                                 cache.put(binaryRoot,res);
                                 return res;
                             } else {
                                 File jZip = new File(jFolder.getAbsolutePath() + ".zip");
                                 if (jZip.isFile()) {
-                                    res = new Result(FileUtil.getArchiveRoot(FileUtil.toFileObject(jZip)));
+                                    res = new Result(FileUtil.getArchiveRoot(FileUtil.toFileObject(jZip)), null);
                                     cache.put(binaryRoot,res);
                                     return res;
                                 }
@@ -109,7 +113,7 @@
                     }
                 }
                 if (srcDir != null) {
-                    res = new Result(srcDir);
+                    res = new Result(srcDir, genSrcDirF);
                     cache.put(binaryRoot,res);
                     return res;
                 }
@@ -117,14 +121,14 @@
             if (binaryRoot.equals(getClassesUrl())) {
                 FileObject srcDir = project.getSourceDirectory();
                 if (srcDir != null) {
-                    res = new Result(srcDir);
+                    res = new Result(srcDir, project.getGeneratedClassesDirectory());
                 }
             } else {
                 for (String testType : project.supportedTestTypes()) {
                     if (binaryRoot.equals(getTestClassesUrl(testType))) {
                         FileObject testSrcDir = project.getTestSourceDirectory(testType);
                         if (testSrcDir != null) {
-                            res = new Result(testSrcDir);
+                            res = new Result(testSrcDir, project.getTestGeneratedClassesDirectory(testType));
                             break;
                         }
                     }
@@ -149,7 +153,7 @@
                                     "In " + FileUtil.getFileDisplayName(project.getProjectDirectory()) +
                                     " " + loc + " is neither a directory nor a JAR");
                         } else if (u.equals(binaryRoot)) {
-                            res = new Result(entry.getKey());
+                            res = new Result(entry.getKey(), null);
                             break ECUS;
                         }
                     }
@@ -182,15 +186,20 @@
     
     private static class Result implements SourceForBinaryQuery.Result {
                
-        private FileObject res;
+        private FileObject[] res;
         
-        public Result(FileObject res) {
+        public Result(FileObject res, File other) {
             assert res != null;
-            this.res = res;
+            FileObject otherFO = other != null ? FileUtil.toFileObject(other) : null;
+            if (otherFO != null) {
+                this.res = new FileObject[] {res, otherFO};
+            } else {
+                this.res = new FileObject[] {res};
+            }
         }
         
         public FileObject[] getRoots () {
-            return new FileObject[] {res};
+            return res;
         }
         
         public void addChangeListener (ChangeListener l) {
diff --git a/apisupport.project/test/unit/src/org/netbeans/modules/apisupport/project/queries/SourceForBinaryImplTest.java b/apisupport.project/test/unit/src/org/netbeans/modules/apisupport/project/queries/SourceForBinaryImplTest.java
--- a/apisupport.project/test/unit/src/org/netbeans/modules/apisupport/project/queries/SourceForBinaryImplTest.java
+++ b/apisupport.project/test/unit/src/org/netbeans/modules/apisupport/project/queries/SourceForBinaryImplTest.java
@@ -43,8 +43,10 @@
 
 import java.io.File;
 import java.net.URL;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.List;
 import java.util.jar.Manifest;
 import org.netbeans.api.java.classpath.ClassPath;
 import org.netbeans.api.java.queries.SourceForBinaryQuery;
@@ -139,7 +141,7 @@
         URL u = FileUtil.getArchiveRoot(jarF.toURI().toURL());
         assertEquals("right results for " + u,
             Collections.singletonList(src),
-            Arrays.asList(SourceForBinaryQuery.findSourceRoots(u).getRoots()));
+            trimGenerated(Arrays.asList(SourceForBinaryQuery.findSourceRoots(u).getRoots())));
     }
     
     private void check(String srcS, String jarS) throws Exception {
@@ -154,7 +156,17 @@
         URL u = FileUtil.urlForArchiveOrDir(classesF);
         assertEquals("right source root for " + u,
             Collections.singletonList(src),
-            Arrays.asList(SourceForBinaryQuery.findSourceRoots(u).getRoots()));
+            trimGenerated(Arrays.asList(SourceForBinaryQuery.findSourceRoots(u).getRoots())));
+    }
+
+    private List<FileObject> trimGenerated(List<FileObject> dirs) {
+        List<FileObject> result = new ArrayList<FileObject>();
+        for (FileObject dir : dirs) {
+            if (!dir.getName().endsWith("-generated")) {
+                result.add(dir);
+            }
+        }
+        return result;
     }
     
 }
diff --git a/hibernate/build.xml b/hibernate/build.xml
--- a/hibernate/build.xml
+++ b/hibernate/build.xml
@@ -44,79 +44,6 @@
     <description>Builds, tests, and runs the project org.netbeans.modules.hibernate</description>
     <import file="../nbbuild/templates/projectized.xml"/>
 
-    <property name="s2b_root_cfg" location="src/org/netbeans/modules/hibernate/cfg/model"/>
-    <property name="s2b_root_mapping" location="src/org/netbeans/modules/hibernate/mapping/model"/>
-    <property name="s2b_root_reveng" location="src/org/netbeans/modules/hibernate/reveng/model"/>
-    <property name="s2b_res_root" location="src/org/netbeans/modules/hibernate/resources"/>
-
-    <target name="s2binit" depends="build-init">
-	<taskdef name="schema2beans" classname="org.netbeans.modules.s2banttask.Schema2BeansAntTask">
-	  <classpath>
-		<pathelement path="${schema2beans.dir}/modules/org-netbeans-modules-schema2beans.jar" />
-		<pathelement path="${nb_all}/schema2beans/dev/schema2beansdev.jar" />
-		<pathelement path="${nb_all}/schema2beans/anttask/s2banttask.jar"/>
-	  </classpath>
-	</taskdef>
-    </target>
-
-    <target name="s2bgen-cfg" depends="s2binit">
-     <echo message="generating code generation input file information" />
-	<schema2beans schema="${s2b_res_root}/hibernate-configuration-3.0.dtd"
-	  mddFile="${s2b_res_root}/hibernate-configuration-3.0.mdd"
-	  package="org.netbeans.modules.hibernate.cfg.model"
-	  validate="false"
-	  removeUnreferencedNodes="true"
-	  rootDir="src"/>
-    </target>
-
-    <target name="s2bgen-mapping" depends="s2binit">
-     <echo message="generating code generation input file information" />
-	<schema2beans schema="${s2b_res_root}/hibernate-mapping-3.0.dtd"
-	  mddFile="${s2b_res_root}/hibernate-mapping-3.0.mdd"
-	  package="org.netbeans.modules.hibernate.mapping.model"
-	  validate="false"
-	  removeUnreferencedNodes="true"
-	  rootDir="src"/>
-    </target>
-    
-    <target name="s2bgen-reveng" depends="s2binit">
-     <echo message="generating code generation input file information" />
-	<schema2beans schema="${s2b_res_root}/hibernate-reverse-engineering-3.0.dtd"
-	  mddFile="${s2b_res_root}/hibernate-reverse-engineering-3.0.mdd"
-	  package="org.netbeans.modules.hibernate.reveng.model"
-	  validate="false"
-	  removeUnreferencedNodes="true"
-	  rootDir="src"/>
-    </target>
-
-    <target name="compile" depends="s2bgen-cfg, s2bgen-mapping, s2bgen-reveng, projectized-common.compile"/>
-
-    <target name="clean" depends="clean-s2b-src, projectized-common.clean"/>
-
-    <target name="clean-s2b-src">
-        <mkdir dir="${s2b_root_cfg}"/>
-        <mkdir dir="${s2b_root_mapping}"/>
-        <mkdir dir="${s2b_root_reveng}"/>
-        <delete>
-            <fileset dir="${s2b_root_cfg}">
-                <include name="*.java"/>
-            </fileset>
-        </delete>
-        <delete>
-            <fileset dir="${s2b_root_mapping}">
-                <include name="*.java"/>
-            </fileset>
-        </delete>
-        <delete>
-            <fileset dir="${s2b_root_reveng}">
-                <include name="*.java"/>
-            </fileset>
-        </delete>
-        <delete dir="${s2b_root_cfg}"/>
-        <delete dir="${s2b_root_mapping}"/>
-        <delete dir="${s2b_root_reveng}"/>
-    </target>
-
     <!-- Unit test related -->
     <property name="derby.data.dir" value="test/unit/data"/>
     <available file="test/unit/data/db-derby-10.2.2.0-bin"
diff --git a/hibernate/src/org/netbeans/modules/hibernate/cfg/model/package-info.java b/hibernate/src/org/netbeans/modules/hibernate/cfg/model/package-info.java
new file mode 100644
--- /dev/null
+++ b/hibernate/src/org/netbeans/modules/hibernate/cfg/model/package-info.java
@@ -0,0 +1,52 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ *
+ * Contributor(s):
+ *
+ * Portions Copyrighted 2009 Sun Microsystems, Inc.
+ */
+
+@Schema2Beans(
+    schema="../../resources/hibernate-configuration-3.0.dtd",
+    schemaType=SchemaType.DTD,
+    mddFile="../../resources/hibernate-configuration-3.0.mdd",
+    outputType=OutputType.TRADITIONAL_BASEBEAN,
+    validate=false,
+    removeUnreferencedNodes=true
+)
+package org.netbeans.modules.hibernate.cfg.model;
+
+import org.netbeans.modules.schema2beans.Schema2Beans;
+import org.netbeans.modules.schema2beans.Schema2Beans.OutputType;
+import org.netbeans.modules.schema2beans.Schema2Beans.SchemaType;
diff --git a/hibernate/src/org/netbeans/modules/hibernate/mapping/model/package-info.java b/hibernate/src/org/netbeans/modules/hibernate/mapping/model/package-info.java
new file mode 100644
--- /dev/null
+++ b/hibernate/src/org/netbeans/modules/hibernate/mapping/model/package-info.java
@@ -0,0 +1,52 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ *
+ * Contributor(s):
+ *
+ * Portions Copyrighted 2009 Sun Microsystems, Inc.
+ */
+
+@Schema2Beans(
+    schema="../../resources/hibernate-mapping-3.0.dtd",
+    schemaType=SchemaType.DTD,
+    mddFile="../../resources/hibernate-mapping-3.0.mdd",
+    outputType=OutputType.TRADITIONAL_BASEBEAN,
+    validate=false,
+    removeUnreferencedNodes=true
+)
+package org.netbeans.modules.hibernate.mapping.model;
+
+import org.netbeans.modules.schema2beans.Schema2Beans;
+import org.netbeans.modules.schema2beans.Schema2Beans.OutputType;
+import org.netbeans.modules.schema2beans.Schema2Beans.SchemaType;
diff --git a/hibernate/src/org/netbeans/modules/hibernate/reveng/model/package-info.java b/hibernate/src/org/netbeans/modules/hibernate/reveng/model/package-info.java
new file mode 100644
--- /dev/null
+++ b/hibernate/src/org/netbeans/modules/hibernate/reveng/model/package-info.java
@@ -0,0 +1,52 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ *
+ * Contributor(s):
+ *
+ * Portions Copyrighted 2009 Sun Microsystems, Inc.
+ */
+
+@Schema2Beans(
+    schema="../../resources/hibernate-reverse-engineering-3.0.dtd",
+    schemaType=SchemaType.DTD,
+    mddFile="../../resources/hibernate-reverse-engineering-3.0.mdd",
+    outputType=OutputType.TRADITIONAL_BASEBEAN,
+    validate=false,
+    removeUnreferencedNodes=true
+)
+package org.netbeans.modules.hibernate.reveng.model;
+
+import org.netbeans.modules.schema2beans.Schema2Beans;
+import org.netbeans.modules.schema2beans.Schema2Beans.OutputType;
+import org.netbeans.modules.schema2beans.Schema2Beans.SchemaType;
diff --git a/j2ee.dd.webservice/build.xml b/j2ee.dd.webservice/build.xml
--- a/j2ee.dd.webservice/build.xml
+++ b/j2ee.dd.webservice/build.xml
@@ -40,77 +40,6 @@
 Version 2 license, then the option applies only if the new code is
 made subject to such option by the copyright holder.
 -->
-
 <project name="j2ee.dd.webservice" default="netbeans" basedir=".">
   <import file="../nbbuild/templates/projectized.xml"/>
-
-  <property name="s2b_root_1_1" location="src/org/netbeans/modules/j2ee/dd/impl/webservices/model_1_1"/>
-  <property name="s2b_root_1_2" location="src/org/netbeans/modules/j2ee/dd/impl/webservices/model_1_2"/>
-  <property name="s2b_res_root" location="src/org/netbeans/modules/j2ee/dd/impl/resources"/>
-
-  <target name="s2binit" depends="build-init">
-	<taskdef name="schema2beans" classname="org.netbeans.modules.s2banttask.Schema2BeansAntTask">
-	  <classpath>
-		<pathelement path="${schema2beans.dir}/modules/org-netbeans-modules-schema2beans.jar" />
-		<pathelement path="${nb_all}/schema2beans/dev/schema2beansdev.jar" />
-		<pathelement path="${nb_all}/schema2beans/anttask/s2banttask.jar"/>
-	  </classpath>
-	</taskdef>
-  </target>
-  
-   <target name="dd2beansgen" depends="s2binit">
-     <echo message="generating code generation input file information" />
-
-	<schema2beans schema="${s2b_res_root}/j2ee_web_services_1_1.xsd"
- 	  mddFile="${s2b_res_root}/j2ee_web_services_1_1.mdd"
-	  package="org.netbeans.modules.j2ee.dd.impl.webservices.model_1_1"
-      schemaType="xmlschema"
-	  rootDir="src"
-	  validate="true"
-	  attrProp="true"
-	  generateHasChanged="true"
-	  outputType="javabeans"
-	  commonInterface="CommonBean"
-	  useInterfaces="true"
-	  extendBaseBean="true"
-	  finder="on /webservices find webservice-description by webservice-description-name,on /webservices/webservice-description/port-component find handler by handler-name,on /webservices/webservice-description/port-component/handler find init-param by param-name,on /webservices/webservice-description find port-component by port-component-name"/>
-          
-	<schema2beans schema="${s2b_res_root}/javaee_web_services_1_2.xsd"
- 	  mddFile="${s2b_res_root}/javaee_web_services_1_2.mdd"
-	  package="org.netbeans.modules.j2ee.dd.impl.webservices.model_1_2"
-      schemaType="xmlschema"
-	  rootDir="src"
-	  validate="true"
-	  attrProp="true"
-	  generateHasChanged="true"
-	  outputType="javabeans"
-	  commonInterface="CommonBean"
-	  useInterfaces="true"
-	  extendBaseBean="true"
-	  finder="on /webservices find webservice-description by webservice-description-name,on /webservices/webservice-description/port-component find handler by handler-name,on /webservices/webservice-description/port-component/handler find init-param by param-name,on /webservices/webservice-description find port-component by port-component-name"/>
-  </target>
-
-  <target name="compile" depends="dd2beansgen,projectized-common.compile"/>
-  
-  <target name="clean" depends="clean-ddgen-src, clean-javadoc, projectized-common.clean"/>
-
-  <target name="clean-ddgen-src">
-        <mkdir dir="${s2b_root_1_1}"/>
-        <mkdir dir="${s2b_root_1_2}"/>
-        <delete>
-            <fileset dir="${s2b_root_1_1}">
-                <include name="*.java"/>
-            </fileset>
-             <fileset dir="${s2b_root_1_2}">
-                <include name="*.java"/>
-            </fileset>
-        </delete>
-        <delete dir="${s2b_root_1_1}"/>
-        <delete dir="${s2b_root_1_2}"/>
-  </target>
-  
-  <target name="clean-javadoc">
-  	<delete dir="javadoc"/>
-  </target>
-
 </project>
diff --git a/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/impl/webservices/model_1_1/package-info.java b/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/impl/webservices/model_1_1/package-info.java
new file mode 100644
--- /dev/null
+++ b/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/impl/webservices/model_1_1/package-info.java
@@ -0,0 +1,62 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ *
+ * Contributor(s):
+ *
+ * Portions Copyrighted 2009 Sun Microsystems, Inc.
+ */
+
+@Schema2Beans(
+    schema="../../resources/j2ee_web_services_1_1.xsd",
+    schemaType=SchemaType.XML_SCHEMA,
+    mddFile="../../resources/j2ee_web_services_1_1.mdd",
+    validate=true,
+    attrProp=true,
+	generateHasChanged=true,
+	outputType=OutputType.JAVABEANS,
+	commonInterface="CommonBean",
+	useInterfaces=true,
+	extendBaseBean=true,
+	finder={
+        "on /webservices find webservice-description by webservice-description-name",
+        "on /webservices/webservice-description/port-component find handler by handler-name",
+        "on /webservices/webservice-description/port-component/handler find init-param by param-name",
+        "on /webservices/webservice-description find port-component by port-component-name"
+    }
+)
+package org.netbeans.modules.j2ee.dd.impl.webservices.model_1_1;
+
+import org.netbeans.modules.schema2beans.Schema2Beans;
+import org.netbeans.modules.schema2beans.Schema2Beans.OutputType;
+import org.netbeans.modules.schema2beans.Schema2Beans.SchemaType;
diff --git a/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/impl/webservices/model_1_2/package-info.java b/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/impl/webservices/model_1_2/package-info.java
new file mode 100644
--- /dev/null
+++ b/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/impl/webservices/model_1_2/package-info.java
@@ -0,0 +1,62 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ *
+ * Contributor(s):
+ *
+ * Portions Copyrighted 2009 Sun Microsystems, Inc.
+ */
+
+@Schema2Beans(
+    schema="../../resources/javaee_web_services_1_2.xsd",
+    schemaType=SchemaType.XML_SCHEMA,
+    mddFile="../../resources/javaee_web_services_1_2.mdd",
+    validate=true,
+    attrProp=true,
+	generateHasChanged=true,
+	outputType=OutputType.JAVABEANS,
+	commonInterface="CommonBean",
+	useInterfaces=true,
+	extendBaseBean=true,
+	finder={
+        "on /webservices find webservice-description by webservice-description-name",
+        "on /webservices/webservice-description/port-component find handler by handler-name",
+        "on /webservices/webservice-description/port-component/handler find init-param by param-name",
+        "on /webservices/webservice-description find port-component by port-component-name"
+    }
+)
+package org.netbeans.modules.j2ee.dd.impl.webservices.model_1_2;
+
+import org.netbeans.modules.schema2beans.Schema2Beans;
+import org.netbeans.modules.schema2beans.Schema2Beans.OutputType;
+import org.netbeans.modules.schema2beans.Schema2Beans.SchemaType;
diff --git a/j2ee.jboss4/build.xml b/j2ee.jboss4/build.xml
--- a/j2ee.jboss4/build.xml
+++ b/j2ee.jboss4/build.xml
@@ -4,7 +4,6 @@
 
 Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
 
-
 The contents of this file are subject to the terms of either the GNU
 General Public License Version 2 only ("GPL") or the Common
 Development and Distribution License("CDDL") (collectively, the
@@ -42,87 +41,4 @@
 -->
 <project name="j2ee.jboss4" default="netbeans" basedir=".">
     <import file="../nbbuild/templates/projectized.xml"/>
-  <target name="build-init" depends="projectized.build-init"/>
-
-  <property name="jb_dir" location="src/org/netbeans/modules/j2ee/jboss4"/>
-
-  <target name="s2binit" depends="build-init">
-	<taskdef name="schema2beans" classname="org.netbeans.modules.s2banttask.Schema2BeansAntTask">
-	  <classpath>
-		<pathelement path="${schema2beans.dir}/modules/org-netbeans-modules-schema2beans.jar" />
-		<pathelement path="${nb_all}/schema2beans/dev/schema2beansdev.jar" />
-		<pathelement path="${nb_all}/schema2beans/anttask/s2banttask.jar"/>
-	  </classpath>
-	</taskdef>
-  </target>
-  
-  <target name="dd2beans_gen" depends="s2binit">
-      <echo message="generating bean graph for JBoss 4 Server configuration files" />
-	<schema2beans schema="${jb_dir}/resources/jboss-web_4_0.dtd"
-	  package="org.netbeans.modules.j2ee.jboss4.config.gen"
-	  schemaType="dtd"
-	  validate="true"
-	  attrProp="true"
-	  removeUnreferencedNodes="true"
-          docroot="jboss-web"
-	  rootDir="src"/>
-	<schema2beans schema="${jb_dir}/resources/jboss-app_4_0.dtd"
-	  package="org.netbeans.modules.j2ee.jboss4.config.gen"
-	  schemaType="dtd"
-	  validate="true"
-	  attrProp="true"
-	  removeUnreferencedNodes="true"
-          docroot="jboss-app"
-	  rootDir="src"/>
-	<schema2beans schema="${jb_dir}/resources/jboss_4_0.dtd"
-	  package="org.netbeans.modules.j2ee.jboss4.config.gen"
-	  schemaType="dtd"
-	  validate="true"
-	  attrProp="true"
-	  removeUnreferencedNodes="true"
-          docroot="jboss"
-	  rootDir="src"/>
-	<schema2beans schema="${jb_dir}/resources/jboss-ds_1_5.dtd"
-	  package="org.netbeans.modules.j2ee.jboss4.config.gen"
-	  schemaType="dtd"
-	  validate="true"
-	  attrProp="true"
-	  removeUnreferencedNodes="true"
-          docroot="datasources"
-	  rootDir="src"/>
-	<schema2beans schema="${jb_dir}/resources/jboss-service_4_0.dtd"
-	  package="org.netbeans.modules.j2ee.jboss4.config.gen"
-	  schemaType="dtd"
-	  validate="true"
-	  attrProp="true"
-	  removeUnreferencedNodes="true"
-          docroot="server"
-	  rootDir="src"/>
-	<schema2beans schema="${jb_dir}/resources/jboss-client_4_0.dtd"
-	  package="org.netbeans.modules.j2ee.jboss4.config.gen"
-	  schemaType="dtd"
-	  validate="true"
-	  attrProp="true"
-	  removeUnreferencedNodes="true"
-          docroot="jboss-client"
-	  rootDir="src"/>
-  </target>
-  
-  <target name="compile" depends="dd2beans_gen, projectized-common.compile"/>
-    
-  <target name="clean" depends="clean-ddgen-src, projectized-common.clean"/>
-
-  <target name="clean-ddgen-check">
-    <available property="have-config" file="${jb_dir}/config/gen"/>
-  </target>
-
-  <target name="clean-ddgen-src" if="have-config" depends="clean-ddgen-check">
-        <delete>
-            <fileset dir="${jb_dir}/config/gen">
-                <include name="*.java"/>
-            </fileset>
-        </delete>
-        <delete dir="${jb_dir}/config/gen"/>
-  </target>
 </project>
-
diff --git a/j2ee.jboss4/src/org/netbeans/modules/j2ee/jboss4/config/gen/package-info.java b/j2ee.jboss4/src/org/netbeans/modules/j2ee/jboss4/config/gen/package-info.java
new file mode 100644
--- /dev/null
+++ b/j2ee.jboss4/src/org/netbeans/modules/j2ee/jboss4/config/gen/package-info.java
@@ -0,0 +1,101 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ *
+ * Contributor(s):
+ *
+ * Portions Copyrighted 2009 Sun Microsystems, Inc.
+ */
+
+@Multiple({
+    @Schema2Beans(
+        schema="../../resources/jboss-client_4_0.dtd",
+        schemaType=SchemaType.DTD,
+        outputType=OutputType.TRADITIONAL_BASEBEAN,
+        validate=true,
+        attrProp=true,
+        removeUnreferencedNodes=true,
+        docRoot="jboss-client"
+    ),
+    @Schema2Beans(
+        schema="../../resources/jboss-service_4_0.dtd",
+        schemaType=SchemaType.DTD,
+        outputType=OutputType.TRADITIONAL_BASEBEAN,
+        validate=true,
+        attrProp=true,
+        removeUnreferencedNodes=true,
+        docRoot="server"
+    ),
+    @Schema2Beans(
+        schema="../../resources/jboss-ds_1_5.dtd",
+        schemaType=SchemaType.DTD,
+        outputType=OutputType.TRADITIONAL_BASEBEAN,
+        validate=true,
+        attrProp=true,
+        removeUnreferencedNodes=true,
+        docRoot="datasources"
+    ),
+    @Schema2Beans(
+        schema="../../resources/jboss_4_0.dtd",
+        schemaType=SchemaType.DTD,
+        outputType=OutputType.TRADITIONAL_BASEBEAN,
+        validate=true,
+        attrProp=true,
+        removeUnreferencedNodes=true,
+        docRoot="jboss"
+    ),
+    @Schema2Beans(
+        schema="../../resources/jboss-app_4_0.dtd",
+        schemaType=SchemaType.DTD,
+        outputType=OutputType.TRADITIONAL_BASEBEAN,
+        validate=true,
+        attrProp=true,
+        removeUnreferencedNodes=true,
+        docRoot="jboss-app"
+    ),
+    @Schema2Beans(
+        schema="../../resources/jboss-web_4_0.dtd",
+        schemaType=SchemaType.DTD,
+        outputType=OutputType.TRADITIONAL_BASEBEAN,
+        validate=true,
+        attrProp=true,
+        removeUnreferencedNodes=true,
+        docRoot="jboss-web"
+    )
+})
+package org.netbeans.modules.j2ee.jboss4.config.gen;
+
+import org.netbeans.modules.schema2beans.Schema2Beans;
+import org.netbeans.modules.schema2beans.Schema2Beans.Multiple;
+import org.netbeans.modules.schema2beans.Schema2Beans.OutputType;
+import org.netbeans.modules.schema2beans.Schema2Beans.SchemaType;
diff --git a/j2ee.persistence/build.xml b/j2ee.persistence/build.xml
--- a/j2ee.persistence/build.xml
+++ b/j2ee.persistence/build.xml
@@ -4,7 +4,6 @@
 
 Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
 
-
 The contents of this file are subject to the terms of either the GNU
 General Public License Version 2 only ("GPL") or the Common
 Development and Distribution License("CDDL") (collectively, the
@@ -42,98 +41,4 @@
 -->
 <project basedir="." default="netbeans" name="j2ee.persistence">
     <import file="../nbbuild/templates/projectized.xml"/>
-
-    <property name="s2b_root_orm_1_0" location="src/org/netbeans/modules/j2ee/persistence/dd/orm/model_1_0"/>
-    <property name="s2b_root_persistence_1_0" location="src/org/netbeans/modules/j2ee/persistence/dd/persistence/model_1_0"/>
-    <property name="s2b_root_orm_2_0" location="src/org/netbeans/modules/j2ee/persistence/dd/orm/model_2_0"/>
-    <property name="s2b_root_persistence_2_0" location="src/org/netbeans/modules/j2ee/persistence/dd/persistence/model_2_0"/>
-    <property name="s2b_res_root" location="src/org/netbeans/modules/j2ee/persistence/dd/resources"/>
-
-    <target name="s2binit" depends="build-init">
-        <taskdef name="schema2beans" classname="org.netbeans.modules.s2banttask.Schema2BeansAntTask">
-            <classpath>
-                <pathelement path="${schema2beans.dir}/modules/org-netbeans-modules-schema2beans.jar" />
-                <pathelement path="${nb_all}/schema2beans/dev/schema2beansdev.jar" />
-                <pathelement path="${nb_all}/schema2beans/anttask/s2banttask.jar"/>
-            </classpath>
-        </taskdef>
-    </target>
-
-    <target name="dd2beansgen" depends="s2binit">
-        <echo message="generating code generation input file information" />
-        <schema2beans schema="${s2b_res_root}/orm_1_0.xsd"
-        docRoot="entity-mappings"
-        mddFile="${s2b_res_root}/orm_1_0.mdd"
-        package="org.netbeans.modules.j2ee.persistence.dd.orm.model_1_0"
-        schemaType="xmlschema"
-        useInterfaces="true"
-        validate="true"
-        attrProp="true"
-        removeUnreferencedNodes="true"
-        rootDir="src"/> 
-        <schema2beans schema="${s2b_res_root}/persistence_1_0.xsd"
-        mddFile="${s2b_res_root}/persistence_1_0.mdd"
-        package="org.netbeans.modules.j2ee.persistence.dd.persistence.model_1_0"
-        schemaType="xmlschema"
-        useInterfaces="true"
-        validate="true"
-        attrProp="true"
-        removeUnreferencedNodes="true"
-        rootDir="src"/> 
-        <schema2beans schema="${s2b_res_root}/orm_2_0.xsd"
-        docRoot="entity-mappings"
-        mddFile="${s2b_res_root}/orm_2_0.mdd"
-        package="org.netbeans.modules.j2ee.persistence.dd.orm.model_2_0"
-        schemaType="xmlschema"
-        useInterfaces="true"
-        validate="true"
-        attrProp="true"
-        removeUnreferencedNodes="true"
-        rootDir="src"/>
-        <schema2beans schema="${s2b_res_root}/persistence_2_0.xsd"
-        mddFile="${s2b_res_root}/persistence_2_0.mdd"
-        package="org.netbeans.modules.j2ee.persistence.dd.persistence.model_2_0"
-        schemaType="xmlschema"
-        useInterfaces="true"
-        validate="true"
-        attrProp="true"
-        removeUnreferencedNodes="true"
-        rootDir="src"/>
-    </target>
-
-    <target name="compile" depends="dd2beansgen,projectized-common.compile"/>
-  
-    <target name="clean" depends="projectized-common.clean,clean-ddgen-src"/>
-
-    <target name="clean-ddgen-src">
-        <mkdir dir="${s2b_root_orm_1_0}"/>
-        <mkdir dir="${s2b_root_persistence_1_0}"/>
-        <delete>
-            <fileset dir="${s2b_root_orm_1_0}">
-                <include name="*.java"/>
-            </fileset>
-        </delete>
-        <delete dir="${s2b_root_orm_1_0}"/>
-        <delete>
-            <fileset dir="${s2b_root_persistence_1_0}">
-                <include name="*.java"/>
-            </fileset>
-        </delete>
-        <delete dir="${s2b_root_persistence_1_0}"/>
-        <mkdir dir="${s2b_root_orm_2_0}"/>
-        <mkdir dir="${s2b_root_persistence_2_0}"/>
-        <delete>
-            <fileset dir="${s2b_root_orm_2_0}">
-                <include name="*.java"/>
-            </fileset>
-        </delete>
-        <delete dir="${s2b_root_orm_2_0}"/>
-        <delete>
-            <fileset dir="${s2b_root_persistence_2_0}">
-                <include name="*.java"/>
-            </fileset>
-        </delete>
-        <delete dir="${s2b_root_persistence_2_0}"/>
-    </target>
-        
 </project>
diff --git a/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/dd/orm/model_1_0/package-info.java b/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/dd/orm/model_1_0/package-info.java
new file mode 100644
--- /dev/null
+++ b/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/dd/orm/model_1_0/package-info.java
@@ -0,0 +1,55 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ *
+ * Contributor(s):
+ *
+ * Portions Copyrighted 2009 Sun Microsystems, Inc.
+ */
+
+@Schema2Beans(
+    schema="../../resources/orm_1_0.xsd",
+    docRoot="entity-mappings",
+    mddFile="../../resources/orm_1_0.mdd",
+    schemaType=SchemaType.XML_SCHEMA,
+    outputType=OutputType.TRADITIONAL_BASEBEAN,
+    useInterfaces=true,
+    validate=true,
+    attrProp=true,
+    removeUnreferencedNodes=true
+)
+package org.netbeans.modules.j2ee.persistence.dd.orm.model_1_0;
+
+import org.netbeans.modules.schema2beans.Schema2Beans;
+import org.netbeans.modules.schema2beans.Schema2Beans.OutputType;
+import org.netbeans.modules.schema2beans.Schema2Beans.SchemaType;
diff --git a/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/dd/orm/model_2_0/package-info.java b/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/dd/orm/model_2_0/package-info.java
new file mode 100644
--- /dev/null
+++ b/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/dd/orm/model_2_0/package-info.java
@@ -0,0 +1,55 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ *
+ * Contributor(s):
+ *
+ * Portions Copyrighted 2009 Sun Microsystems, Inc.
+ */
+
+@Schema2Beans(
+    schema="../../resources/orm_2_0.xsd",
+    docRoot="entity-mappings",
+    mddFile="../../resources/orm_2_0.mdd",
+    schemaType=SchemaType.XML_SCHEMA,
+    outputType=OutputType.TRADITIONAL_BASEBEAN,
+    useInterfaces=true,
+    validate=true,
+    attrProp=true,
+    removeUnreferencedNodes=true
+)
+package org.netbeans.modules.j2ee.persistence.dd.orm.model_2_0;
+
+import org.netbeans.modules.schema2beans.Schema2Beans;
+import org.netbeans.modules.schema2beans.Schema2Beans.OutputType;
+import org.netbeans.modules.schema2beans.Schema2Beans.SchemaType;
diff --git a/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/dd/persistence/model_1_0/package-info.java b/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/dd/persistence/model_1_0/package-info.java
new file mode 100644
--- /dev/null
+++ b/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/dd/persistence/model_1_0/package-info.java
@@ -0,0 +1,54 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ *
+ * Contributor(s):
+ *
+ * Portions Copyrighted 2009 Sun Microsystems, Inc.
+ */
+
+@Schema2Beans(
+    schema="../../resources/persistence_1_0.xsd",
+    mddFile="../../resources/persistence_1_0.mdd",
+    schemaType=SchemaType.XML_SCHEMA,
+    outputType=OutputType.TRADITIONAL_BASEBEAN,
+    useInterfaces=true,
+    validate=true,
+    attrProp=true,
+    removeUnreferencedNodes=true
+)
+package org.netbeans.modules.j2ee.persistence.dd.persistence.model_1_0;
+
+import org.netbeans.modules.schema2beans.Schema2Beans;
+import org.netbeans.modules.schema2beans.Schema2Beans.OutputType;
+import org.netbeans.modules.schema2beans.Schema2Beans.SchemaType;
diff --git a/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/dd/persistence/model_2_0/package-info.java b/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/dd/persistence/model_2_0/package-info.java
new file mode 100644
--- /dev/null
+++ b/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/dd/persistence/model_2_0/package-info.java
@@ -0,0 +1,54 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ *
+ * Contributor(s):
+ *
+ * Portions Copyrighted 2009 Sun Microsystems, Inc.
+ */
+
+@Schema2Beans(
+    schema="../../resources/persistence_2_0.xsd",
+    mddFile="../../resources/persistence_2_0.mdd",
+    schemaType=SchemaType.XML_SCHEMA,
+    outputType=OutputType.TRADITIONAL_BASEBEAN,
+    useInterfaces=true,
+    validate=true,
+    attrProp=true,
+    removeUnreferencedNodes=true
+)
+package org.netbeans.modules.j2ee.persistence.dd.persistence.model_2_0;
+
+import org.netbeans.modules.schema2beans.Schema2Beans;
+import org.netbeans.modules.schema2beans.Schema2Beans.OutputType;
+import org.netbeans.modules.schema2beans.Schema2Beans.SchemaType;
diff --git a/j2ee.sun.dd/build.xml b/j2ee.sun.dd/build.xml
--- a/j2ee.sun.dd/build.xml
+++ b/j2ee.sun.dd/build.xml
@@ -4,7 +4,6 @@
 
 Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
 
-
 The contents of this file are subject to the terms of either the GNU
 General Public License Version 2 only ("GPL") or the Common
 Development and Distribution License("CDDL") (collectively, the
@@ -40,500 +39,6 @@
 Version 2 license, then the option applies only if the new code is
 made subject to such option by the copyright holder.
 -->
-
 <project name="j2ee.sun.dd" default="netbeans" basedir=".">
   <import file="../nbbuild/templates/projectized.xml"/>
-  <property name="s2b_root_common_2_1_0" location="src/org/netbeans/modules/j2ee/sun/dd/impl/common/model_2_1_0"/>
-  <property name="s2b_root_common_2_1_1" location="src/org/netbeans/modules/j2ee/sun/dd/impl/common/model_2_1_1"/>
-  <property name="s2b_root_common_3_0_0" location="src/org/netbeans/modules/j2ee/sun/dd/impl/common/model_3_0_0"/>
-  <property name="s2b_root_ejb_3_1_0" location="src/org/netbeans/modules/j2ee/sun/dd/impl/ejb/model_3_1_0"/>
-  <property name="s2b_root_ejb_3_0_1" location="src/org/netbeans/modules/j2ee/sun/dd/impl/ejb/model_3_0_1"/>
-  <property name="s2b_root_ejb_3_0_0" location="src/org/netbeans/modules/j2ee/sun/dd/impl/ejb/model_3_0_0"/>
-  <property name="s2b_root_ejb_2_1_1" location="src/org/netbeans/modules/j2ee/sun/dd/impl/ejb/model_2_1_1"/>
-  <property name="s2b_root_ejb_2_1_0" location="src/org/netbeans/modules/j2ee/sun/dd/impl/ejb/model_2_1_0"/>
-  <property name="s2b_root_ejb_2_0_0" location="src/org/netbeans/modules/j2ee/sun/dd/impl/ejb/model_2_0_0"/>
-  <property name="s2b_root_web_3_0_0" location="src/org/netbeans/modules/j2ee/sun/dd/impl/web/model_3_0_0"/>
-  <property name="s2b_root_web_2_5_0" location="src/org/netbeans/modules/j2ee/sun/dd/impl/web/model_2_5_0"/>
-  <property name="s2b_root_web_2_4_1" location="src/org/netbeans/modules/j2ee/sun/dd/impl/web/model_2_4_1"/>
-  <property name="s2b_root_web_2_4_0" location="src/org/netbeans/modules/j2ee/sun/dd/impl/web/model_2_4_0"/>
-  <property name="s2b_root_web_2_3_0" location="src/org/netbeans/modules/j2ee/sun/dd/impl/web/model_2_3_0"/>
-  <property name="s2b_root_app_6_0_0" location="src/org/netbeans/modules/j2ee/sun/dd/impl/app/model_6_0_0"/>
-  <property name="s2b_root_app_5_0_0" location="src/org/netbeans/modules/j2ee/sun/dd/impl/app/model_5_0_0"/>
-  <property name="s2b_root_app_1_4_0" location="src/org/netbeans/modules/j2ee/sun/dd/impl/app/model_1_4_0"/>
-  <property name="s2b_root_app_1_3_0" location="src/org/netbeans/modules/j2ee/sun/dd/impl/app/model_1_3_0"/>
-  <property name="s2b_root_client_5_0_0" location="src/org/netbeans/modules/j2ee/sun/dd/impl/client/model_5_0_0"/>
-  <property name="s2b_root_client_6_0_0" location="src/org/netbeans/modules/j2ee/sun/dd/impl/client/model_6_0_0"/>
-  <property name="s2b_root_client_1_4_1" location="src/org/netbeans/modules/j2ee/sun/dd/impl/client/model_1_4_1"/>
-  <property name="s2b_root_client_1_4_0" location="src/org/netbeans/modules/j2ee/sun/dd/impl/client/model_1_4_0"/>
-  <property name="s2b_root_client_1_3_0" location="src/org/netbeans/modules/j2ee/sun/dd/impl/client/model_1_3_0"/>
-  <property name="s2b_root_cmp_1_0" location="src/org/netbeans/modules/j2ee/sun/dd/impl/cmp/model_1_0"/>
-  <property name="s2b_root_cmp_1_1" location="src/org/netbeans/modules/j2ee/sun/dd/impl/cmp/model_1_1"/>
-  <property name="s2b_root_cmp_1_2" location="src/org/netbeans/modules/j2ee/sun/dd/impl/cmp/model_1_2"/>
-  <property name="s2b_root_server_resources" location="src/org/netbeans/modules/j2ee/sun/dd/impl/serverresources/model"/>
-  <property name="s2b_res_root" location="src/org/netbeans/modules/j2ee/sun/dd/impl/resources"/>
-  <property name="s2b_static_verifier" location="src/org/netbeans/modules/j2ee/sun/dd/impl/verifier"/>
-
-  <target name="build-init" depends="projectized.build-init"/>
-
-  <target name="s2binit" depends="build-init">
-	<taskdef name="schema2beans" classname="org.netbeans.modules.s2banttask.Schema2BeansAntTask">
-	  <classpath>
-		<pathelement path="${schema2beans.dir}/modules/org-netbeans-modules-schema2beans.jar" />
-		<pathelement path="${nb_all}/schema2beans/dev/schema2beansdev.jar" />
-		<pathelement path="${nb_all}/schema2beans/anttask/s2banttask.jar"/>
-	  </classpath>
-	</taskdef>
-      </target>
-
-   <target name="dd2beansgen" depends="s2binit">
-     <echo message="generating code generation input file information" />
-
-	<schema2beans schema="${s2b_res_root}/common_elements.dtd"
- 	  mddFile="${s2b_res_root}/common_elements.mdd"
-          docRoot="dummy"
-	  package="org.netbeans.modules.j2ee.sun.dd.impl.common.model_2_1_0"
-	  useInterfaces="true"
-	  validate="true"
-	  attrProp="true"
-	  rootDir="src"/>
-        <schema2beans schema="${s2b_res_root}/common_elements_2_1-1.dtd"
- 	  mddFile="${s2b_res_root}/common_elements_2_1-1.mdd"
-          docRoot="dummy"
-	  package="org.netbeans.modules.j2ee.sun.dd.impl.common.model_2_1_1"
-	  useInterfaces="true"
-	  validate="true"
-	  attrProp="true"
-	  rootDir="src"/>
-        <schema2beans schema="${s2b_res_root}/common_elements_3_0-0.dtd"
- 	  mddFile="${s2b_res_root}/common_elements_3_0-0.mdd"
-          docRoot="dummy"
-	  package="org.netbeans.modules.j2ee.sun.dd.impl.common.model_3_0_0"
-	  useInterfaces="true"
-	  validate="true"
-	  attrProp="true"
-	  rootDir="src"/> 
-       <schema2beans schema="${s2b_res_root}/sun-ejb-jar_3_0-1.dtd"
- 	  mddFile="${s2b_res_root}/sun-ejb-jar_3_0-1.mdd"
-	  package="org.netbeans.modules.j2ee.sun.dd.impl.ejb.model_3_0_1"
-          docRoot="sun-ejb-jar"
-	  useInterfaces="true"
-	  validate="false"
-	  attrProp="true"
-	  rootDir="src"/>
-       <schema2beans schema="${s2b_res_root}/sun-ejb-jar_3_1-0.dtd"
- 	  mddFile="${s2b_res_root}/sun-ejb-jar_3_1-0.mdd"
-	  package="org.netbeans.modules.j2ee.sun.dd.impl.ejb.model_3_1_0"
-          docRoot="sun-ejb-jar"
-	  useInterfaces="true"
-	  validate="false"
-	  attrProp="true"
-	  rootDir="src"/>
-       <schema2beans schema="${s2b_res_root}/sun-ejb-jar_3_0-0.dtd"
- 	  mddFile="${s2b_res_root}/sun-ejb-jar_3_0-0.mdd"
-	  package="org.netbeans.modules.j2ee.sun.dd.impl.ejb.model_3_0_0"
-          docRoot="sun-ejb-jar"
-	  useInterfaces="true"
-	  validate="false"
-	  attrProp="true"
-	  rootDir="src"/>
-        <schema2beans schema="${s2b_res_root}/sun-ejb-jar_2_1-1.dtd"
- 	  mddFile="${s2b_res_root}/sun-ejb-jar_2_1-1.mdd"
-	  package="org.netbeans.modules.j2ee.sun.dd.impl.ejb.model_2_1_1"
-          docRoot="sun-ejb-jar"
-	  useInterfaces="true"
-	  validate="false"
-	  attrProp="true"
-	  rootDir="src"/>
-        <schema2beans schema="${s2b_res_root}/sun-ejb-jar_2_1-0.dtd"
- 	  mddFile="${s2b_res_root}/sun-ejb-jar_2_1-0.mdd"
-	  package="org.netbeans.modules.j2ee.sun.dd.impl.ejb.model_2_1_0"
-          docRoot="sun-ejb-jar"
-	  useInterfaces="true"
-	  validate="false"
-	  attrProp="true"
-	  rootDir="src"/> 
-        <schema2beans schema="${s2b_res_root}/sun-ejb-jar_2_0-0.dtd"
- 	  mddFile="${s2b_res_root}/sun-ejb-jar_2_0-0.mdd"
-	  package="org.netbeans.modules.j2ee.sun.dd.impl.ejb.model_2_0_0"
-          docRoot="sun-ejb-jar"
-	  useInterfaces="true"
-	  validate="false"
-	  attrProp="true"
-	  rootDir="src"/>   
-        <schema2beans schema="${s2b_res_root}/sun-web-app_3_0-0.dtd"
- 	  mddFile="${s2b_res_root}/sun-web-app_3_0-0.mdd"
-	  package="org.netbeans.modules.j2ee.sun.dd.impl.web.model_3_0_0"
-          docRoot="sun-web-app"
-	  useInterfaces="true"
-	  validate="false"
-	  attrProp="true"
-	  rootDir="src"/>
-        <schema2beans schema="${s2b_res_root}/sun-web-app_2_5-0.dtd"
- 	  mddFile="${s2b_res_root}/sun-web-app_2_5-0.mdd"
-	  package="org.netbeans.modules.j2ee.sun.dd.impl.web.model_2_5_0"
-          docRoot="sun-web-app"
-	  useInterfaces="true"
-	  validate="false"
-	  attrProp="true"
-	  rootDir="src"/>  
-        <schema2beans schema="${s2b_res_root}/sun-web-app_2_4-1.dtd"
- 	  mddFile="${s2b_res_root}/sun-web-app_2_4-1.mdd"
-	  package="org.netbeans.modules.j2ee.sun.dd.impl.web.model_2_4_1"
-          docRoot="sun-web-app"
-	  useInterfaces="true"
-	  validate="false"
-	  attrProp="true"
-	  rootDir="src"/>
-        <schema2beans schema="${s2b_res_root}/sun-web-app_2_4-0.dtd"
- 	  mddFile="${s2b_res_root}/sun-web-app_2_4-0.mdd"
-	  package="org.netbeans.modules.j2ee.sun.dd.impl.web.model_2_4_0"
-          docRoot="sun-web-app"
-	  useInterfaces="true"
-	  validate="false"
-	  attrProp="true"
-	  rootDir="src"/> 
-        <schema2beans schema="${s2b_res_root}/sun-web-app_2_3-0.dtd"
- 	  mddFile="${s2b_res_root}/sun-web-app_2_3-0.mdd"
-	  package="org.netbeans.modules.j2ee.sun.dd.impl.web.model_2_3_0"
-          docRoot="sun-web-app"
-	  useInterfaces="true"
-	  validate="false"
-	  attrProp="true"
-	  rootDir="src"/>   
-        <schema2beans schema="${s2b_res_root}/sun-application_6_0-0.dtd"
- 	  mddFile="${s2b_res_root}/sun-application_6_0-0.mdd"
-	  package="org.netbeans.modules.j2ee.sun.dd.impl.app.model_6_0_0"
-          docRoot="sun-application"
-	  useInterfaces="true"
-	  validate="false"
-	  attrProp="true"
-	  rootDir="src"/>
-        <schema2beans schema="${s2b_res_root}/sun-application_5_0-0.dtd"
- 	  mddFile="${s2b_res_root}/sun-application_5_0-0.mdd"
-	  package="org.netbeans.modules.j2ee.sun.dd.impl.app.model_5_0_0"
-          docRoot="sun-application"
-	  useInterfaces="true"
-	  validate="false"
-	  attrProp="true"
-	  rootDir="src"/>
-        <schema2beans schema="${s2b_res_root}/sun-application_1_4-0.dtd"
- 	  mddFile="${s2b_res_root}/sun-application_1_4-0.mdd"
-	  package="org.netbeans.modules.j2ee.sun.dd.impl.app.model_1_4_0"
-          docRoot="sun-application"
-	  useInterfaces="true"
-	  validate="false"
-	  attrProp="true"
-	  rootDir="src"/>  
-        <schema2beans schema="${s2b_res_root}/sun-application_1_3-0.dtd"
- 	  mddFile="${s2b_res_root}/sun-application_1_3-0.mdd"
-	  package="org.netbeans.modules.j2ee.sun.dd.impl.app.model_1_3_0"
-          docRoot="sun-application"
-	  useInterfaces="true"
-	  validate="false"
-	  attrProp="true"
-	  rootDir="src"/>  
-        <schema2beans schema="${s2b_res_root}/sun-application-client_5_0-0.dtd"
- 	  mddFile="${s2b_res_root}/sun-application-client_5_0-0.mdd"
-	  package="org.netbeans.modules.j2ee.sun.dd.impl.client.model_5_0_0"
-          docRoot="sun-application-client"
-	  useInterfaces="true"
-	  validate="false"
-	  attrProp="true"
-	  rootDir="src"/>
-        <schema2beans schema="${s2b_res_root}/sun-application-client_6_0-0.dtd"
- 	  mddFile="${s2b_res_root}/sun-application-client_6_0-0.mdd"
-	  package="org.netbeans.modules.j2ee.sun.dd.impl.client.model_6_0_0"
-          docRoot="sun-application-client"
-	  useInterfaces="true"
-	  validate="false"
-	  attrProp="true"
-	  rootDir="src"/>
-        <schema2beans schema="${s2b_res_root}/sun-application-client_1_4-1.dtd"
- 	  mddFile="${s2b_res_root}/sun-application-client_1_4-1.mdd"
-	  package="org.netbeans.modules.j2ee.sun.dd.impl.client.model_1_4_1"
-          docRoot="sun-application-client"
-	  useInterfaces="true"
-	  validate="false"
-	  attrProp="true"
-	  rootDir="src"/>
-        <schema2beans schema="${s2b_res_root}/sun-application-client_1_4-0.dtd"
- 	  mddFile="${s2b_res_root}/sun-application-client_1_4-0.mdd"
-	  package="org.netbeans.modules.j2ee.sun.dd.impl.client.model_1_4_0"
-          docRoot="sun-application-client"
-	  useInterfaces="true"
-	  validate="false"
-	  attrProp="true"
-	  rootDir="src"/>
-        <schema2beans schema="${s2b_res_root}/sun-application-client_1_3-0.dtd"
- 	  mddFile="${s2b_res_root}/sun-application-client_1_3-0.mdd"
-	  package="org.netbeans.modules.j2ee.sun.dd.impl.client.model_1_3_0"
-          docRoot="sun-application-client"
-	  useInterfaces="true"
-	  validate="false"
-	  attrProp="true"
-	  rootDir="src"/>
-        <schema2beans schema="${s2b_res_root}/sun-cmp-mapping_1_0.dtd"
-            mddFile="${s2b_res_root}/sun-cmp-mapping_1_0.mdd"
-            package="org.netbeans.modules.j2ee.sun.dd.impl.cmp.model_1_0"
-            docRoot="sun-cmp-mappings"
-            useInterfaces="true"
-            validate="false"
-            attrProp="true"
-            rootDir="src"/>    
-        <schema2beans schema="${s2b_res_root}/sun-cmp-mapping_1_1.dtd"
-            mddFile="${s2b_res_root}/sun-cmp-mapping_1_1.mdd"
-            package="org.netbeans.modules.j2ee.sun.dd.impl.cmp.model_1_1"
-            docRoot="sun-cmp-mappings"
-            useInterfaces="true"
-            validate="false"
-            attrProp="true"
-            rootDir="src"/>
-        <schema2beans schema="${s2b_res_root}/sun-cmp-mapping_1_2.dtd"
-            mddFile="${s2b_res_root}/sun-cmp-mapping_1_2.mdd"
-            package="org.netbeans.modules.j2ee.sun.dd.impl.cmp.model_1_2"
-            docRoot="sun-cmp-mappings"
-            useInterfaces="true"
-            validate="false"
-            attrProp="true"
-            rootDir="src"/>    
-        <schema2beans schema="${s2b_res_root}/sun-resources_1_3.dtd"
- 	  mddFile="${s2b_res_root}/sun-resources.mdd"
-	  package="org.netbeans.modules.j2ee.sun.dd.impl.serverresources.model"
-          docRoot="resources"
-	  useInterfaces="true"
-	  validate="false"
-	  attrProp="true"
-	  rootDir="src"/>     
-        <schema2beans schema="${s2b_res_root}/static-verification_1_4.dtd"
-	  package="org.netbeans.modules.j2ee.sun.dd.impl.verifier"
-          docRoot="static-verification"
-	  useInterfaces="false"
-	  validate="false"
-	  attrProp="true"
-	  rootDir="src"/>     
-	  <!--<delete file="${s2b_root_2_4}/WebAppType.java"/>-->
-  </target>
-  
-  <target name="gen-sun-cmp-mappings-interfaces" depends="s2binit">
-    <echo message="generating sun-cmp-mappings schema2beans code."/>
-    <schema2beans schema="${s2b_res_root}/sun-cmp-mapping_1_2.dtd"
-          mddFile="${s2b_res_root}/sun-cmp-mapping_1_2.mdd"
-          package="org.netbeans.modules.j2ee.sun.dd.api.cmp"
-          docRoot="sun-cmp-mappings"
-          generateInterfaces="true"
-          validate="false"
-          attrProp="true"
-          rootDir="src"/>
-  </target>      
-    
-  <target name="compile" depends="dd2beansgen, release, projectized-common.compile"/>
-  
-  <target name="release">
-    <!--copy todir="${cdp.dest.dir}/${cluster.dir}/${nb.modules/autoload.dir}">
-      <fileset dir="release/modules/autoload"/>
-    </copy-->
-  </target>
-
-
-  <target name="clean" depends="projectized-common.clean">
-        <mkdir dir="${s2b_root_common_2_1_0}"/>
-        <mkdir dir="${s2b_root_common_2_1_1}"/>
-        <mkdir dir="${s2b_root_common_3_0_0}"/>
-        <mkdir dir="${s2b_root_ejb_3_1_0}"/>
-        <mkdir dir="${s2b_root_ejb_3_0_1}"/>
-        <mkdir dir="${s2b_root_ejb_3_0_0}"/>
-        <mkdir dir="${s2b_root_ejb_2_1_1}"/>
-        <mkdir dir="${s2b_root_ejb_2_1_0}"/>
-        <mkdir dir="${s2b_root_ejb_2_0_0}"/>
-        <mkdir dir="${s2b_root_web_3_0_0}"/>
-        <mkdir dir="${s2b_root_web_2_5_0}"/>
-        <mkdir dir="${s2b_root_web_2_4_1}"/>
-        <mkdir dir="${s2b_root_web_2_4_0}"/>
-        <mkdir dir="${s2b_root_web_2_3_0}"/>
-        <mkdir dir="${s2b_root_app_6_0_0}"/>
-        <mkdir dir="${s2b_root_app_5_0_0}"/>
-        <mkdir dir="${s2b_root_app_1_4_0}"/>
-        <mkdir dir="${s2b_root_app_1_3_0}"/>
-        <mkdir dir="${s2b_root_client_6_0_0}"/>
-        <mkdir dir="${s2b_root_client_5_0_0}"/>
-        <mkdir dir="${s2b_root_client_1_4_1}"/>
-        <mkdir dir="${s2b_root_client_1_4_0}"/>
-        <mkdir dir="${s2b_root_client_1_3_0}"/>
-        <mkdir dir="${s2b_root_cmp_1_0}"/>
-        <mkdir dir="${s2b_root_cmp_1_1}"/>
-        <mkdir dir="${s2b_root_cmp_1_2}"/>
-        <mkdir dir="${s2b_root_server_resources}"/>
-	<mkdir dir="${s2b_static_verifier}"/>
-        <delete>
-            <fileset dir="${s2b_root_common_2_1_0}">
-                <include name="*.java"/>
-            </fileset>
-        </delete>
-        <delete dir="${s2b_root_common_2_1_0}"/>
-        <delete>
-            <fileset dir="${s2b_root_common_2_1_1}">
-                <include name="*.java"/>
-            </fileset>
-        </delete>
-        <delete dir="${s2b_root_common_2_1_1}"/>
-        <delete>
-            <fileset dir="${s2b_root_common_3_0_0}">
-                <include name="*.java"/>
-            </fileset>
-        </delete>
-        <delete dir="${s2b_root_common_3_0_0}"/>
-        <delete>
-            <fileset dir="${s2b_root_ejb_3_1_0}">
-                <include name="*.java"/>
-            </fileset>
-        </delete>
-        <delete dir="${s2b_root_ejb_3_1_0}"/>
-        <delete>
-            <fileset dir="${s2b_root_ejb_3_0_1}">
-                <include name="*.java"/>
-            </fileset>
-        </delete>
-        <delete dir="${s2b_root_ejb_3_0_1}"/>
-        <delete>
-            <fileset dir="${s2b_root_ejb_3_0_0}">
-                <include name="*.java"/>
-            </fileset>
-        </delete>
-        <delete dir="${s2b_root_ejb_3_0_0}"/>
-        <delete>
-            <fileset dir="${s2b_root_ejb_2_1_1}">
-                <include name="*.java"/>
-            </fileset>
-        </delete>
-        <delete dir="${s2b_root_ejb_2_1_1}"/>
-        <delete>
-            <fileset dir="${s2b_root_ejb_2_1_0}">
-                <include name="*.java"/>
-            </fileset>
-        </delete>
-        <delete dir="${s2b_root_ejb_2_1_0}"/>
-        <delete>
-            <fileset dir="${s2b_root_ejb_2_0_0}">
-                <include name="*.java"/>
-            </fileset>
-        </delete>
-        <delete dir="${s2b_root_ejb_2_0_0}"/>
-        <delete>
-            <fileset dir="${s2b_root_web_3_0_0}">
-                <include name="*.java"/>
-            </fileset>
-        </delete>
-        <delete dir="${s2b_root_web_3_0_0}"/>
-        <delete>
-            <fileset dir="${s2b_root_web_2_5_0}">
-                <include name="*.java"/>
-            </fileset>
-        </delete>
-        <delete dir="${s2b_root_web_2_5_0}"/>
-        <delete>
-            <fileset dir="${s2b_root_web_2_4_1}">
-                <include name="*.java"/>
-            </fileset>
-        </delete>
-        <delete dir="${s2b_root_web_2_4_1}"/>
-        <delete>
-            <fileset dir="${s2b_root_web_2_4_0}">
-                <include name="*.java"/>
-            </fileset>
-        </delete>
-        <delete dir="${s2b_root_web_2_4_0}"/>
-        <delete>
-            <fileset dir="${s2b_root_web_2_3_0}">
-                <include name="*.java"/>
-            </fileset>
-        </delete>
-        <delete dir="${s2b_root_web_2_3_0}"/>
-        <delete>
-            <fileset dir="${s2b_root_app_6_0_0}">
-                <include name="*.java"/>
-            </fileset>
-        </delete>
-        <delete dir="${s2b_root_app_6_0_0}"/>
-        <delete>
-            <fileset dir="${s2b_root_app_5_0_0}">
-                <include name="*.java"/>
-            </fileset>
-        </delete>
-        <delete dir="${s2b_root_app_5_0_0}"/>
-        <delete>
-            <fileset dir="${s2b_root_app_1_4_0}">
-                <include name="*.java"/>
-            </fileset>
-        </delete>
-        <delete dir="${s2b_root_app_1_4_0}"/>
-        <delete>
-            <fileset dir="${s2b_root_app_1_3_0}">
-                <include name="*.java"/>
-            </fileset>
-        </delete>
-        <delete dir="${s2b_root_app_1_3_0}"/>
-        <delete>
-            <fileset dir="${s2b_root_client_5_0_0}">
-                <include name="*.java"/>
-            </fileset>
-        </delete>
-        <delete dir="${s2b_root_client_5_0_0}"/>
-        <delete>
-            <fileset dir="${s2b_root_client_6_0_0}">
-                <include name="*.java"/>
-            </fileset>
-        </delete>
-        <delete dir="${s2b_root_client_6_0_0}"/>
-        <delete>
-            <fileset dir="${s2b_root_client_1_4_1}">
-                <include name="*.java"/>
-            </fileset>
-        </delete>
-        <delete dir="${s2b_root_client_1_4_1}"/>
-        <delete>
-            <fileset dir="${s2b_root_client_1_4_0}">
-                <include name="*.java"/>
-            </fileset>
-        </delete>
-        <delete dir="${s2b_root_client_1_4_0}"/>
-        <delete>
-            <fileset dir="${s2b_root_client_1_3_0}">
-                <include name="*.java"/>
-            </fileset>
-        </delete>
-        <delete dir="${s2b_root_client_1_3_0}"/>    
-        <delete>
-            <fileset dir="${s2b_root_cmp_1_0}">
-                <include name="*.java"/>
-            </fileset>
-        </delete>
-        <delete dir="${s2b_root_cmp_1_0}"/>
-        <delete>
-            <fileset dir="${s2b_root_cmp_1_1}">
-                <include name="*.java"/>
-            </fileset>
-        </delete>
-        <delete dir="${s2b_root_cmp_1_1}"/>
-        <delete>
-            <fileset dir="${s2b_root_cmp_1_2}">
-                <include name="*.java"/>
-            </fileset>
-        </delete>
-        <delete dir="${s2b_root_cmp_1_2}"/>
-        <delete>
-            <fileset dir="${s2b_root_server_resources}">
-                <include name="*.java"/>
-            </fileset>
-        </delete>
-        <delete dir="${s2b_root_server_resources}"/>
-        <delete>
-            <fileset dir="${s2b_static_verifier}">
-                <include name="*.java"/>
-            </fileset>
-        </delete>
-        <delete dir="${s2b_static_verifier}"/>
-  </target>
-    <target name="javahelp" >
-    </target>
 </project>
-
diff --git a/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/api/cmp/package-info.java b/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/api/cmp/package-info.java
new file mode 100644
--- /dev/null
+++ b/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/api/cmp/package-info.java
@@ -0,0 +1,50 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ *
+ * Contributor(s):
+ *
+ * Portions Copyrighted 2009 Sun Microsystems, Inc.
+ */
+
+/*
+@Schema2Beans(
+    schema="../../impl/resources/sun-cmp-mapping_1_2.dtd",
+    mddFile="../../impl/resources/sun-cmp-mapping_1_2.mdd",
+    docRoot="sun-cmp-mappings",
+    generateInterfaces=true,
+    validate=false,
+    attrProp=true
+)
+ */
+package org.netbeans.modules.j2ee.sun.dd.api.cmp;
diff --git a/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/app/model_1_3_0/package-info.java b/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/app/model_1_3_0/package-info.java
new file mode 100644
--- /dev/null
+++ b/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/app/model_1_3_0/package-info.java
@@ -0,0 +1,54 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ *
+ * Contributor(s):
+ *
+ * Portions Copyrighted 2009 Sun Microsystems, Inc.
+ */
+
+@Schema2Beans(
+    schema="../../resources/sun-application_1_3-0.dtd",
+    schemaType=SchemaType.DTD,
+    mddFile="../../resources/sun-application_1_3-0.mdd",
+    outputType=OutputType.TRADITIONAL_BASEBEAN,
+    docRoot="sun-application",
+    useInterfaces=true,
+    validate=false,
+    attrProp=true
+)
+package org.netbeans.modules.j2ee.sun.dd.impl.app.model_1_3_0;
+
+import org.netbeans.modules.schema2beans.Schema2Beans;
+import org.netbeans.modules.schema2beans.Schema2Beans.OutputType;
+import org.netbeans.modules.schema2beans.Schema2Beans.SchemaType;
diff --git a/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/app/model_1_4_0/package-info.java b/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/app/model_1_4_0/package-info.java
new file mode 100644
--- /dev/null
+++ b/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/app/model_1_4_0/package-info.java
@@ -0,0 +1,54 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ *
+ * Contributor(s):
+ *
+ * Portions Copyrighted 2009 Sun Microsystems, Inc.
+ */
+
+@Schema2Beans(
+    schema="../../resources/sun-application_1_4-0.dtd",
+    schemaType=SchemaType.DTD,
+    mddFile="../../resources/sun-application_1_4-0.mdd",
+    outputType=OutputType.TRADITIONAL_BASEBEAN,
+    docRoot="sun-application",
+    useInterfaces=true,
+    validate=false,
+    attrProp=true
+)
+package org.netbeans.modules.j2ee.sun.dd.impl.app.model_1_4_0;
+
+import org.netbeans.modules.schema2beans.Schema2Beans;
+import org.netbeans.modules.schema2beans.Schema2Beans.OutputType;
+import org.netbeans.modules.schema2beans.Schema2Beans.SchemaType;
diff --git a/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/app/model_5_0_0/package-info.java b/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/app/model_5_0_0/package-info.java
new file mode 100644
--- /dev/null
+++ b/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/app/model_5_0_0/package-info.java
@@ -0,0 +1,54 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ *
+ * Contributor(s):
+ *
+ * Portions Copyrighted 2009 Sun Microsystems, Inc.
+ */
+
+@Schema2Beans(
+    schema="../../resources/sun-application_5_0-0.dtd",
+    schemaType=SchemaType.DTD,
+    mddFile="../../resources/sun-application_5_0-0.mdd",
+    outputType=OutputType.TRADITIONAL_BASEBEAN,
+    docRoot="sun-application",
+    useInterfaces=true,
+    validate=false,
+    attrProp=true
+)
+package org.netbeans.modules.j2ee.sun.dd.impl.app.model_5_0_0;
+
+import org.netbeans.modules.schema2beans.Schema2Beans;
+import org.netbeans.modules.schema2beans.Schema2Beans.OutputType;
+import org.netbeans.modules.schema2beans.Schema2Beans.SchemaType;
diff --git a/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/app/model_6_0_0/package-info.java b/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/app/model_6_0_0/package-info.java
new file mode 100644
--- /dev/null
+++ b/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/app/model_6_0_0/package-info.java
@@ -0,0 +1,54 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ *
+ * Contributor(s):
+ *
+ * Portions Copyrighted 2009 Sun Microsystems, Inc.
+ */
+
+@Schema2Beans(
+    schema="../../resources/sun-application_6_0-0.dtd",
+    schemaType=SchemaType.DTD,
+    mddFile="../../resources/sun-application_6_0-0.mdd",
+    outputType=OutputType.TRADITIONAL_BASEBEAN,
+    docRoot="sun-application",
+    useInterfaces=true,
+    validate=false,
+    attrProp=true
+)
+package org.netbeans.modules.j2ee.sun.dd.impl.app.model_6_0_0;
+
+import org.netbeans.modules.schema2beans.Schema2Beans;
+import org.netbeans.modules.schema2beans.Schema2Beans.OutputType;
+import org.netbeans.modules.schema2beans.Schema2Beans.SchemaType;
diff --git a/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/client/model_1_3_0/package-info.java b/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/client/model_1_3_0/package-info.java
new file mode 100644
--- /dev/null
+++ b/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/client/model_1_3_0/package-info.java
@@ -0,0 +1,54 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ *
+ * Contributor(s):
+ *
+ * Portions Copyrighted 2009 Sun Microsystems, Inc.
+ */
+
+@Schema2Beans(
+    schema="../../resources/sun-application-client_1_3-0.dtd",
+    schemaType=SchemaType.DTD,
+    mddFile="../../resources/sun-application-client_1_3-0.mdd",
+    outputType=OutputType.TRADITIONAL_BASEBEAN,
+    docRoot="sun-application-client",
+    useInterfaces=true,
+    validate=false,
+    attrProp=true
+)
+package org.netbeans.modules.j2ee.sun.dd.impl.client.model_1_3_0;
+
+import org.netbeans.modules.schema2beans.Schema2Beans;
+import org.netbeans.modules.schema2beans.Schema2Beans.OutputType;
+import org.netbeans.modules.schema2beans.Schema2Beans.SchemaType;
diff --git a/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/client/model_1_4_0/package-info.java b/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/client/model_1_4_0/package-info.java
new file mode 100644
--- /dev/null
+++ b/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/client/model_1_4_0/package-info.java
@@ -0,0 +1,54 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ *
+ * Contributor(s):
+ *
+ * Portions Copyrighted 2009 Sun Microsystems, Inc.
+ */
+
+@Schema2Beans(
+    schema="../../resources/sun-application-client_1_4-0.dtd",
+    schemaType=SchemaType.DTD,
+    mddFile="../../resources/sun-application-client_1_4-0.mdd",
+    outputType=OutputType.TRADITIONAL_BASEBEAN,
+    docRoot="sun-application-client",
+    useInterfaces=true,
+    validate=false,
+    attrProp=true
+)
+package org.netbeans.modules.j2ee.sun.dd.impl.client.model_1_4_0;
+
+import org.netbeans.modules.schema2beans.Schema2Beans;
+import org.netbeans.modules.schema2beans.Schema2Beans.OutputType;
+import org.netbeans.modules.schema2beans.Schema2Beans.SchemaType;
diff --git a/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/client/model_1_4_1/package-info.java b/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/client/model_1_4_1/package-info.java
new file mode 100644
--- /dev/null
+++ b/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/client/model_1_4_1/package-info.java
@@ -0,0 +1,54 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ *
+ * Contributor(s):
+ *
+ * Portions Copyrighted 2009 Sun Microsystems, Inc.
+ */
+
+@Schema2Beans(
+    schema="../../resources/sun-application-client_1_4-1.dtd",
+    schemaType=SchemaType.DTD,
+    mddFile="../../resources/sun-application-client_1_4-1.mdd",
+    outputType=OutputType.TRADITIONAL_BASEBEAN,
+    docRoot="sun-application-client",
+    useInterfaces=true,
+    validate=false,
+    attrProp=true
+)
+package org.netbeans.modules.j2ee.sun.dd.impl.client.model_1_4_1;
+
+import org.netbeans.modules.schema2beans.Schema2Beans;
+import org.netbeans.modules.schema2beans.Schema2Beans.OutputType;
+import org.netbeans.modules.schema2beans.Schema2Beans.SchemaType;
diff --git a/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/client/model_5_0_0/package-info.java b/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/client/model_5_0_0/package-info.java
new file mode 100644
--- /dev/null
+++ b/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/client/model_5_0_0/package-info.java
@@ -0,0 +1,54 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ *
+ * Contributor(s):
+ *
+ * Portions Copyrighted 2009 Sun Microsystems, Inc.
+ */
+
+@Schema2Beans(
+    schema="../../resources/sun-application-client_5_0-0.dtd",
+    schemaType=SchemaType.DTD,
+    mddFile="../../resources/sun-application-client_5_0-0.mdd",
+    outputType=OutputType.TRADITIONAL_BASEBEAN,
+    docRoot="sun-application-client",
+    useInterfaces=true,
+    validate=false,
+    attrProp=true
+)
+package org.netbeans.modules.j2ee.sun.dd.impl.client.model_5_0_0;
+
+import org.netbeans.modules.schema2beans.Schema2Beans;
+import org.netbeans.modules.schema2beans.Schema2Beans.OutputType;
+import org.netbeans.modules.schema2beans.Schema2Beans.SchemaType;
diff --git a/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/client/model_6_0_0/package-info.java b/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/client/model_6_0_0/package-info.java
new file mode 100644
--- /dev/null
+++ b/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/client/model_6_0_0/package-info.java
@@ -0,0 +1,54 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ *
+ * Contributor(s):
+ *
+ * Portions Copyrighted 2009 Sun Microsystems, Inc.
+ */
+
+@Schema2Beans(
+    schema="../../resources/sun-application-client_6_0-0.dtd",
+    schemaType=SchemaType.DTD,
+    mddFile="../../resources/sun-application-client_6_0-0.mdd",
+    outputType=OutputType.TRADITIONAL_BASEBEAN,
+    docRoot="sun-application-client",
+    useInterfaces=true,
+    validate=false,
+    attrProp=true
+)
+package org.netbeans.modules.j2ee.sun.dd.impl.client.model_6_0_0;
+
+import org.netbeans.modules.schema2beans.Schema2Beans;
+import org.netbeans.modules.schema2beans.Schema2Beans.OutputType;
+import org.netbeans.modules.schema2beans.Schema2Beans.SchemaType;
diff --git a/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/cmp/model_1_0/package-info.java b/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/cmp/model_1_0/package-info.java
new file mode 100644
--- /dev/null
+++ b/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/cmp/model_1_0/package-info.java
@@ -0,0 +1,54 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ *
+ * Contributor(s):
+ *
+ * Portions Copyrighted 2009 Sun Microsystems, Inc.
+ */
+
+@Schema2Beans(
+    schema="../../resources/sun-cmp-mapping_1_0.dtd",
+    schemaType=SchemaType.DTD,
+    mddFile="../../resources/sun-cmp-mapping_1_0.mdd",
+    outputType=OutputType.TRADITIONAL_BASEBEAN,
+    docRoot="sun-cmp-mappings",
+    useInterfaces=true,
+    validate=false,
+    attrProp=true
+)
+package org.netbeans.modules.j2ee.sun.dd.impl.cmp.model_1_0;
+
+import org.netbeans.modules.schema2beans.Schema2Beans;
+import org.netbeans.modules.schema2beans.Schema2Beans.OutputType;
+import org.netbeans.modules.schema2beans.Schema2Beans.SchemaType;
diff --git a/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/cmp/model_1_1/package-info.java b/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/cmp/model_1_1/package-info.java
new file mode 100644
--- /dev/null
+++ b/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/cmp/model_1_1/package-info.java
@@ -0,0 +1,54 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ *
+ * Contributor(s):
+ *
+ * Portions Copyrighted 2009 Sun Microsystems, Inc.
+ */
+
+@Schema2Beans(
+    schema="../../resources/sun-cmp-mapping_1_1.dtd",
+    schemaType=SchemaType.DTD,
+    mddFile="../../resources/sun-cmp-mapping_1_1.mdd",
+    outputType=OutputType.TRADITIONAL_BASEBEAN,
+    docRoot="sun-cmp-mappings",
+    useInterfaces=true,
+    validate=false,
+    attrProp=true
+)
+package org.netbeans.modules.j2ee.sun.dd.impl.cmp.model_1_1;
+
+import org.netbeans.modules.schema2beans.Schema2Beans;
+import org.netbeans.modules.schema2beans.Schema2Beans.OutputType;
+import org.netbeans.modules.schema2beans.Schema2Beans.SchemaType;
diff --git a/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/cmp/model_1_2/package-info.java b/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/cmp/model_1_2/package-info.java
new file mode 100644
--- /dev/null
+++ b/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/cmp/model_1_2/package-info.java
@@ -0,0 +1,54 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ *
+ * Contributor(s):
+ *
+ * Portions Copyrighted 2009 Sun Microsystems, Inc.
+ */
+
+@Schema2Beans(
+    schema="../../resources/sun-cmp-mapping_1_2.dtd",
+    schemaType=SchemaType.DTD,
+    mddFile="../../resources/sun-cmp-mapping_1_2.mdd",
+    outputType=OutputType.TRADITIONAL_BASEBEAN,
+    docRoot="sun-cmp-mappings",
+    useInterfaces=true,
+    validate=false,
+    attrProp=true
+)
+package org.netbeans.modules.j2ee.sun.dd.impl.cmp.model_1_2;
+
+import org.netbeans.modules.schema2beans.Schema2Beans;
+import org.netbeans.modules.schema2beans.Schema2Beans.OutputType;
+import org.netbeans.modules.schema2beans.Schema2Beans.SchemaType;
diff --git a/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/common/model_2_1_0/package-info.java b/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/common/model_2_1_0/package-info.java
new file mode 100644
--- /dev/null
+++ b/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/common/model_2_1_0/package-info.java
@@ -0,0 +1,54 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ *
+ * Contributor(s):
+ *
+ * Portions Copyrighted 2009 Sun Microsystems, Inc.
+ */
+
+@Schema2Beans(
+    schema="../../resources/common_elements.dtd",
+    schemaType=SchemaType.DTD,
+ 	mddFile="../../resources/common_elements.mdd",
+    outputType=OutputType.TRADITIONAL_BASEBEAN,
+    docRoot="dummy",
+	useInterfaces=true,
+	validate=true,
+	attrProp=true
+)
+package org.netbeans.modules.j2ee.sun.dd.impl.common.model_2_1_0;
+
+import org.netbeans.modules.schema2beans.Schema2Beans;
+import org.netbeans.modules.schema2beans.Schema2Beans.OutputType;
+import org.netbeans.modules.schema2beans.Schema2Beans.SchemaType;
diff --git a/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/common/model_2_1_1/package-info.java b/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/common/model_2_1_1/package-info.java
new file mode 100644
--- /dev/null
+++ b/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/common/model_2_1_1/package-info.java
@@ -0,0 +1,54 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ *
+ * Contributor(s):
+ *
+ * Portions Copyrighted 2009 Sun Microsystems, Inc.
+ */
+
+@Schema2Beans(
+    schema="../../resources/common_elements_2_1-1.dtd",
+    schemaType=SchemaType.DTD,
+ 	mddFile="../../resources/common_elements_2_1-1.mdd",
+    outputType=OutputType.TRADITIONAL_BASEBEAN,
+    docRoot="dummy",
+	useInterfaces=true,
+	validate=true,
+	attrProp=true
+)
+package org.netbeans.modules.j2ee.sun.dd.impl.common.model_2_1_1;
+
+import org.netbeans.modules.schema2beans.Schema2Beans;
+import org.netbeans.modules.schema2beans.Schema2Beans.OutputType;
+import org.netbeans.modules.schema2beans.Schema2Beans.SchemaType;
diff --git a/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/common/model_3_0_0/package-info.java b/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/common/model_3_0_0/package-info.java
new file mode 100644
--- /dev/null
+++ b/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/common/model_3_0_0/package-info.java
@@ -0,0 +1,54 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ *
+ * Contributor(s):
+ *
+ * Portions Copyrighted 2009 Sun Microsystems, Inc.
+ */
+
+@Schema2Beans(
+    schema="../../resources/common_elements_3_0-0.dtd",
+    schemaType=SchemaType.DTD,
+    mddFile="../../resources/common_elements_3_0-0.mdd",
+    outputType=OutputType.TRADITIONAL_BASEBEAN,
+    docRoot="dummy",
+    useInterfaces=true,
+    validate=true,
+    attrProp=true
+)
+package org.netbeans.modules.j2ee.sun.dd.impl.common.model_3_0_0;
+
+import org.netbeans.modules.schema2beans.Schema2Beans;
+import org.netbeans.modules.schema2beans.Schema2Beans.OutputType;
+import org.netbeans.modules.schema2beans.Schema2Beans.SchemaType;
diff --git a/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/ejb/model_2_0_0/package-info.java b/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/ejb/model_2_0_0/package-info.java
new file mode 100644
--- /dev/null
+++ b/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/ejb/model_2_0_0/package-info.java
@@ -0,0 +1,54 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ *
+ * Contributor(s):
+ *
+ * Portions Copyrighted 2009 Sun Microsystems, Inc.
+ */
+
+@Schema2Beans(
+    schema="../../resources/sun-ejb-jar_2_0-0.dtd",
+    schemaType=SchemaType.DTD,
+    mddFile="../../resources/sun-ejb-jar_2_0-0.mdd",
+    outputType=OutputType.TRADITIONAL_BASEBEAN,
+    docRoot="sun-ejb-jar",
+    useInterfaces=true,
+    validate=false,
+    attrProp=true
+)
+package org.netbeans.modules.j2ee.sun.dd.impl.ejb.model_2_0_0;
+
+import org.netbeans.modules.schema2beans.Schema2Beans;
+import org.netbeans.modules.schema2beans.Schema2Beans.OutputType;
+import org.netbeans.modules.schema2beans.Schema2Beans.SchemaType;
diff --git a/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/ejb/model_2_1_0/package-info.java b/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/ejb/model_2_1_0/package-info.java
new file mode 100644
--- /dev/null
+++ b/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/ejb/model_2_1_0/package-info.java
@@ -0,0 +1,54 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ *
+ * Contributor(s):
+ *
+ * Portions Copyrighted 2009 Sun Microsystems, Inc.
+ */
+
+@Schema2Beans(
+    schema="../../resources/sun-ejb-jar_2_1-0.dtd",
+    schemaType=SchemaType.DTD,
+    mddFile="../../resources/sun-ejb-jar_2_1-0.mdd",
+    outputType=OutputType.TRADITIONAL_BASEBEAN,
+    docRoot="sun-ejb-jar",
+    useInterfaces=true,
+    validate=false,
+    attrProp=true
+)
+package org.netbeans.modules.j2ee.sun.dd.impl.ejb.model_2_1_0;
+
+import org.netbeans.modules.schema2beans.Schema2Beans;
+import org.netbeans.modules.schema2beans.Schema2Beans.OutputType;
+import org.netbeans.modules.schema2beans.Schema2Beans.SchemaType;
diff --git a/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/ejb/model_2_1_1/package-info.java b/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/ejb/model_2_1_1/package-info.java
new file mode 100644
--- /dev/null
+++ b/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/ejb/model_2_1_1/package-info.java
@@ -0,0 +1,54 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ *
+ * Contributor(s):
+ *
+ * Portions Copyrighted 2009 Sun Microsystems, Inc.
+ */
+
+@Schema2Beans(
+    schema="../../resources/sun-ejb-jar_2_1-1.dtd",
+    schemaType=SchemaType.DTD,
+    mddFile="../../resources/sun-ejb-jar_2_1-1.mdd",
+    outputType=OutputType.TRADITIONAL_BASEBEAN,
+    docRoot="sun-ejb-jar",
+    useInterfaces=true,
+    validate=false,
+    attrProp=true
+)
+package org.netbeans.modules.j2ee.sun.dd.impl.ejb.model_2_1_1;
+
+import org.netbeans.modules.schema2beans.Schema2Beans;
+import org.netbeans.modules.schema2beans.Schema2Beans.OutputType;
+import org.netbeans.modules.schema2beans.Schema2Beans.SchemaType;
diff --git a/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/ejb/model_3_0_0/package-info.java b/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/ejb/model_3_0_0/package-info.java
new file mode 100644
--- /dev/null
+++ b/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/ejb/model_3_0_0/package-info.java
@@ -0,0 +1,54 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ *
+ * Contributor(s):
+ *
+ * Portions Copyrighted 2009 Sun Microsystems, Inc.
+ */
+
+@Schema2Beans(
+    schema="../../resources/sun-ejb-jar_3_0-0.dtd",
+    schemaType=SchemaType.DTD,
+    mddFile="../../resources/sun-ejb-jar_3_0-0.mdd",
+    outputType=OutputType.TRADITIONAL_BASEBEAN,
+    docRoot="sun-ejb-jar",
+    useInterfaces=true,
+    validate=false,
+    attrProp=true
+)
+package org.netbeans.modules.j2ee.sun.dd.impl.ejb.model_3_0_0;
+
+import org.netbeans.modules.schema2beans.Schema2Beans;
+import org.netbeans.modules.schema2beans.Schema2Beans.OutputType;
+import org.netbeans.modules.schema2beans.Schema2Beans.SchemaType;
diff --git a/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/ejb/model_3_0_1/package-info.java b/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/ejb/model_3_0_1/package-info.java
new file mode 100644
--- /dev/null
+++ b/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/ejb/model_3_0_1/package-info.java
@@ -0,0 +1,54 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ *
+ * Contributor(s):
+ *
+ * Portions Copyrighted 2009 Sun Microsystems, Inc.
+ */
+
+@Schema2Beans(
+    schema="../../resources/sun-ejb-jar_3_0-1.dtd",
+    schemaType=SchemaType.DTD,
+    mddFile="../../resources/sun-ejb-jar_3_0-1.mdd",
+    outputType=OutputType.TRADITIONAL_BASEBEAN,
+    docRoot="sun-ejb-jar",
+    useInterfaces=true,
+    validate=false,
+    attrProp=true
+)
+package org.netbeans.modules.j2ee.sun.dd.impl.ejb.model_3_0_1;
+
+import org.netbeans.modules.schema2beans.Schema2Beans;
+import org.netbeans.modules.schema2beans.Schema2Beans.OutputType;
+import org.netbeans.modules.schema2beans.Schema2Beans.SchemaType;
diff --git a/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/ejb/model_3_1_0/package-info.java b/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/ejb/model_3_1_0/package-info.java
new file mode 100644
--- /dev/null
+++ b/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/ejb/model_3_1_0/package-info.java
@@ -0,0 +1,54 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ *
+ * Contributor(s):
+ *
+ * Portions Copyrighted 2009 Sun Microsystems, Inc.
+ */
+
+@Schema2Beans(
+    schema="../../resources/sun-ejb-jar_3_1-0.dtd",
+    schemaType=SchemaType.DTD,
+    mddFile="../../resources/sun-ejb-jar_3_1-0.mdd",
+    outputType=OutputType.TRADITIONAL_BASEBEAN,
+    docRoot="sun-ejb-jar",
+    useInterfaces=true,
+    validate=false,
+    attrProp=true
+)
+package org.netbeans.modules.j2ee.sun.dd.impl.ejb.model_3_1_0;
+
+import org.netbeans.modules.schema2beans.Schema2Beans;
+import org.netbeans.modules.schema2beans.Schema2Beans.OutputType;
+import org.netbeans.modules.schema2beans.Schema2Beans.SchemaType;
diff --git a/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/web/model_2_3_0/package-info.java b/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/web/model_2_3_0/package-info.java
new file mode 100644
--- /dev/null
+++ b/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/web/model_2_3_0/package-info.java
@@ -0,0 +1,54 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ *
+ * Contributor(s):
+ *
+ * Portions Copyrighted 2009 Sun Microsystems, Inc.
+ */
+
+@Schema2Beans(
+    schema="../../resources/sun-web-app_2_3-0.dtd",
+    schemaType=SchemaType.DTD,
+    mddFile="../../resources/sun-web-app_2_3-0.mdd",
+    outputType=OutputType.TRADITIONAL_BASEBEAN,
+    docRoot="sun-web-app",
+    useInterfaces=true,
+    validate=false,
+    attrProp=true
+)
+package org.netbeans.modules.j2ee.sun.dd.impl.web.model_2_3_0;
+
+import org.netbeans.modules.schema2beans.Schema2Beans;
+import org.netbeans.modules.schema2beans.Schema2Beans.OutputType;
+import org.netbeans.modules.schema2beans.Schema2Beans.SchemaType;
diff --git a/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/web/model_2_4_0/package-info.java b/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/web/model_2_4_0/package-info.java
new file mode 100644
--- /dev/null
+++ b/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/web/model_2_4_0/package-info.java
@@ -0,0 +1,54 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ *
+ * Contributor(s):
+ *
+ * Portions Copyrighted 2009 Sun Microsystems, Inc.
+ */
+
+@Schema2Beans(
+    schema="../../resources/sun-web-app_2_4-0.dtd",
+    schemaType=SchemaType.DTD,
+    mddFile="../../resources/sun-web-app_2_4-0.mdd",
+    outputType=OutputType.TRADITIONAL_BASEBEAN,
+    docRoot="sun-web-app",
+    useInterfaces=true,
+    validate=false,
+    attrProp=true
+)
+package org.netbeans.modules.j2ee.sun.dd.impl.web.model_2_4_0;
+
+import org.netbeans.modules.schema2beans.Schema2Beans;
+import org.netbeans.modules.schema2beans.Schema2Beans.OutputType;
+import org.netbeans.modules.schema2beans.Schema2Beans.SchemaType;
diff --git a/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/web/model_2_4_1/package-info.java b/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/web/model_2_4_1/package-info.java
new file mode 100644
--- /dev/null
+++ b/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/web/model_2_4_1/package-info.java
@@ -0,0 +1,54 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ *
+ * Contributor(s):
+ *
+ * Portions Copyrighted 2009 Sun Microsystems, Inc.
+ */
+
+@Schema2Beans(
+    schema="../../resources/sun-web-app_2_4-1.dtd",
+    schemaType=SchemaType.DTD,
+    mddFile="../../resources/sun-web-app_2_4-1.mdd",
+    outputType=OutputType.TRADITIONAL_BASEBEAN,
+    docRoot="sun-web-app",
+    useInterfaces=true,
+    validate=false,
+    attrProp=true
+)
+package org.netbeans.modules.j2ee.sun.dd.impl.web.model_2_4_1;
+
+import org.netbeans.modules.schema2beans.Schema2Beans;
+import org.netbeans.modules.schema2beans.Schema2Beans.OutputType;
+import org.netbeans.modules.schema2beans.Schema2Beans.SchemaType;
diff --git a/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/web/model_2_5_0/package-info.java b/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/web/model_2_5_0/package-info.java
new file mode 100644
--- /dev/null
+++ b/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/web/model_2_5_0/package-info.java
@@ -0,0 +1,54 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ *
+ * Contributor(s):
+ *
+ * Portions Copyrighted 2009 Sun Microsystems, Inc.
+ */
+
+@Schema2Beans(
+    schema="../../resources/sun-web-app_2_5-0.dtd",
+    schemaType=SchemaType.DTD,
+    mddFile="../../resources/sun-web-app_2_5-0.mdd",
+    outputType=OutputType.TRADITIONAL_BASEBEAN,
+    docRoot="sun-web-app",
+    useInterfaces=true,
+    validate=false,
+    attrProp=true
+)
+package org.netbeans.modules.j2ee.sun.dd.impl.web.model_2_5_0;
+
+import org.netbeans.modules.schema2beans.Schema2Beans;
+import org.netbeans.modules.schema2beans.Schema2Beans.OutputType;
+import org.netbeans.modules.schema2beans.Schema2Beans.SchemaType;
diff --git a/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/web/model_3_0_0/package-info.java b/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/web/model_3_0_0/package-info.java
new file mode 100644
--- /dev/null
+++ b/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/web/model_3_0_0/package-info.java
@@ -0,0 +1,54 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ *
+ * Contributor(s):
+ *
+ * Portions Copyrighted 2009 Sun Microsystems, Inc.
+ */
+
+@Schema2Beans(
+    schema="../../resources/sun-web-app_3_0-0.dtd",
+    schemaType=SchemaType.DTD,
+    mddFile="../../resources/sun-web-app_3_0-0.mdd",
+    outputType=OutputType.TRADITIONAL_BASEBEAN,
+    docRoot="sun-web-app",
+    useInterfaces=true,
+    validate=false,
+    attrProp=true
+)
+package org.netbeans.modules.j2ee.sun.dd.impl.web.model_3_0_0;
+
+import org.netbeans.modules.schema2beans.Schema2Beans;
+import org.netbeans.modules.schema2beans.Schema2Beans.OutputType;
+import org.netbeans.modules.schema2beans.Schema2Beans.SchemaType;
diff --git a/j2eeserver/build.xml b/j2eeserver/build.xml
--- a/j2eeserver/build.xml
+++ b/j2eeserver/build.xml
@@ -4,7 +4,6 @@
 
 Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
 
-
 The contents of this file are subject to the terms of either the GNU
 General Public License Version 2 only ("GPL") or the Common
 Development and Distribution License("CDDL") (collectively, the
@@ -44,65 +43,11 @@
 <project name="j2eeserver" default="netbeans" basedir=".">
   <import file="../nbbuild/templates/projectized.xml"/>
 
-  <target name="build-init" depends="projectized.build-init"/>
-
-  <target name="s2binit" depends="build-init">
-	<taskdef name="schema2beans" classname="org.netbeans.modules.s2banttask.Schema2BeansAntTask">
-	  <classpath>
-		<pathelement path="${schema2beans.dir}/modules/org-netbeans-modules-schema2beans.jar" />
-		<pathelement path="${nb_all}/schema2beans/dev/schema2beansdev.jar" />
-		<pathelement path="${nb_all}/schema2beans/anttask/s2banttask.jar"/>
-	  </classpath>
-	</taskdef>
-  </target>
-
-  <target name="privatedtds">
-      <antcall target="ddgen">
-          <param name="dtdfile" value="src/org/netbeans/modules/j2ee/deployment/plugins/api/netbeans-deployment.dtd"/>
-          <param name="dtdpackage" value="org.netbeans.modules.j2ee.deployment.impl.gen.nbd"/>
-          <param name="dtddir" value="org/netbeans/modules/j2ee/deployment/impl/gen/nbd"/>
-      </antcall>
-  </target>
-
-  <target name="ddinit">
-        <mkdir dir="src/${dtddir}"/>
-        <uptodate property="dd.generation" 
-                targetfile="${dtdfile}">
-            <srcfiles dir="src/${dtddir}" includes="*.java"/>
-        </uptodate> 
-  </target>
-
-  <target name="ddgen" depends="init,ddinit" if="dd.generation">
-     <echo message="Generated schema2beans from ${dtdfile}"/>
-     <java classname="org.netbeans.modules.schema2beansdev.GenBeans" fork="yes">
-       <classpath>
-          <pathelement location="${schema2beans.dir}/modules/org-netbeans-modules-schema2beans.jar" />
-          <pathelement location="${nb_all}/schema2beans/dev/schema2beansdev.jar" />
-          <pathelement location="${openide.dir}/core/openide.jar"/>
-          <pathelement location="${openide.loaders.dir}/core/openide-loaders.jar"/>
-       </classpath>
-       <arg line= "-f ${dtdfile}" />
-       <arg line= "-p ${dtdpackage}" />
-       <arg line= "-r src" />
-       <arg line="-javaBeans"/>
-       <arg line="-commonInterface"/>
-       <arg line="-extendBaseBean"/>
-     </java>
-  </target> 
-
   <target name="javadocdtds">
       <copy file="src/org/netbeans/modules/j2ee/deployment/plugins/api/netbeans-deployment.dtd"
         tofile="${netbeans.javadoc.dir}/${code.name.base.dashes}/org/netbeans/modules/j2ee/deployment/plugins/spi/netbeans-deployment.dtd"/>
   </target>
   
-  <target name="compile" depends="privatedtds, projectized-common.compile"/>
-  
-  <target name="clean" depends="clean-ddgen-src, projectized-common.clean"/>
-
-  <target name="clean-ddgen-src">
-    <delete dir="src/org/netbeans/modules/j2ee/deployment/impl/gen"/>
-  </target>
-  
   <target name="javadoc" depends="javadocdtds, projectized.javadoc"/>  
 </project>
 
diff --git a/j2eeserver/src/org/netbeans/modules/j2ee/deployment/impl/gen/nbd/package-info.java b/j2eeserver/src/org/netbeans/modules/j2ee/deployment/impl/gen/nbd/package-info.java
new file mode 100644
--- /dev/null
+++ b/j2eeserver/src/org/netbeans/modules/j2ee/deployment/impl/gen/nbd/package-info.java
@@ -0,0 +1,51 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ *
+ * Contributor(s):
+ *
+ * Portions Copyrighted 2009 Sun Microsystems, Inc.
+ */
+
+@Schema2Beans(
+    schema="../../../plugins/api/netbeans-deployment.dtd",
+    schemaType=SchemaType.DTD,
+    outputType=OutputType.JAVABEANS,
+    // XXX commonInterface="...",
+    extendBaseBean=true
+)
+package org.netbeans.modules.j2ee.deployment.impl.gen.nbd;
+
+import org.netbeans.modules.schema2beans.Schema2Beans;
+import org.netbeans.modules.schema2beans.Schema2Beans.OutputType;
+import org.netbeans.modules.schema2beans.Schema2Beans.SchemaType;
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/CustomJavac.java b/nbbuild/antsrc/org/netbeans/nbbuild/CustomJavac.java
--- a/nbbuild/antsrc/org/netbeans/nbbuild/CustomJavac.java
+++ b/nbbuild/antsrc/org/netbeans/nbbuild/CustomJavac.java
@@ -99,6 +99,13 @@
             createCompilerArg().setPath(processorPath);
         }
         createCompilerArg().setValue("-implicit:class");
+        File generatedClassesDir = new File(getDestdir().getParentFile(), getDestdir().getName() + "-generated");
+        if (generatedClassesDir.isDirectory() || generatedClassesDir.mkdirs()) {
+            createCompilerArg().setValue("-s");
+            createCompilerArg().setFile(generatedClassesDir);
+        } else {
+            log("Warning: could not create " + generatedClassesDir, Project.MSG_WARN);
+        }
         String specifiedCompiler = getProject().getProperty("build.compiler");
         if (specifiedCompiler != null) {
             if (specifiedCompiler.equals("extJavac")) {
diff --git a/nbbuild/javadoctools/links.xml b/nbbuild/javadoctools/links.xml
--- a/nbbuild/javadoctools/links.xml
+++ b/nbbuild/javadoctools/links.xml
@@ -192,3 +192,4 @@
 <link href="${javadoc.docs.org-netbeans-modules-jellytools-platform}" offline="true" packagelistloc="${netbeans.javadoc.dir}/org-netbeans-modules-jellytools-platform"/>
 <link href="${javadoc.docs.org-netbeans-modules-jellytools-ruby}" offline="true" packagelistloc="${netbeans.javadoc.dir}/org-netbeans-modules-jellytools-ruby"/>
 <link href="${javadoc.docs.org-netbeans-modules-javacard-spi}" offline="true" packagelistloc="${netbeans.javadoc.dir}/org-netbeans-modules-javacard-spi"/>
+<link href="${javadoc.docs.org-netbeans-modules-schema2beans}" offline="true" packagelistloc="${netbeans.javadoc.dir}/org-netbeans-modules-schema2beans"/>
diff --git a/nbbuild/javadoctools/properties.xml b/nbbuild/javadoctools/properties.xml
--- a/nbbuild/javadoctools/properties.xml
+++ b/nbbuild/javadoctools/properties.xml
@@ -190,3 +190,4 @@
 <property name="javadoc.docs.org-netbeans-modules-jellytools-platform" value="${javadoc.web.root}/org-netbeans-modules-jellytools-platform"/>
 <property name="javadoc.docs.org-netbeans-modules-jellytools-ruby" value="${javadoc.web.root}/org-netbeans-modules-jellytools-ruby"/>
 <property name="javadoc.docs.org-netbeans-modules-javacard-spi" value="${javadoc.web.root}/org-netbeans-modules-javacard-spi"/>
+<property name="javadoc.docs.org-netbeans-modules-schema2beans" value="${javadoc.web.root}/org-netbeans-modules-schema2beans"/>
diff --git a/nbbuild/javadoctools/replaces.xml b/nbbuild/javadoctools/replaces.xml
--- a/nbbuild/javadoctools/replaces.xml
+++ b/nbbuild/javadoctools/replaces.xml
@@ -190,3 +190,4 @@
 <replacefilter token="@org-netbeans-modules-jellytools-platform@" value="${javadoc.docs.org-netbeans-modules-jellytools-platform}"/>
 <replacefilter token="@org-netbeans-modules-jellytools-ruby@" value="${javadoc.docs.org-netbeans-modules-jellytools-ruby}"/>
 <replacefilter token="@org-netbeans-modules-javacard-spi@" value="${javadoc.docs.org-netbeans-modules-javacard-spi}"/>
+<replacefilter token="@org-netbeans-modules-schema2beans@" value="${javadoc.docs.org-netbeans-modules-schema2beans}"/>
diff --git a/schema2beans/anttask/build.xml b/schema2beans/anttask/build.xml
deleted file mode 100644
--- a/schema2beans/anttask/build.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
-
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License.  When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
-particular file as subject to the "Classpath" exception as provided
-by Sun in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-Contributor(s):
-
-The Original Software is NetBeans. The Initial Developer of the Original
-Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
-Microsystems, Inc. All Rights Reserved.
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
--->
-
-<project name="schema2beans_anttask" default="jars" basedir=".">
-  <import file="../../nbbuild/default-properties.xml"/>
-
-  <target name="jars" depends="compile">
-	<jar jarfile="s2banttask.jar"
-	  basedir="src"
-	  excludes="**/*.java"
-	  compress="false">
-	</jar>
-  </target>
-
-  <target name="compile">
-    <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}" target="1.4" source="1.4" >
-	  <classpath>
-                <!-- cmdline Ant -->
-                <pathelement location="${ant.core.lib}"/>
-                <!-- Ant in NB -->
-                <!-- Note: in NB 4.0, ${ant.home}/lib/ant.jar will work as is -->
-                <pathelement path="${netbeans.library.path}"/>
-		<pathelement location="${schema2beans.dir}/modules/org-netbeans-modules-schema2beans.jar" />
-		<pathelement location="${nb_all}/schema2beans/dev/schema2beansdev.jar" />
-	  </classpath>
-	</javac>
-  </target>
-
-  <target name="clean">
-    <delete>
-      <fileset dir="src">
-        <include name="**/*.class"/>
-      </fileset>
-    </delete>
-  </target>
-
-  <target name="real-clean" depends="clean"
-          description="Clean everything possible.">
-	<!-- This jar file is used in taskdef's and will cause a problem during a clean if it's not there. -->
-	<delete file="s2banttask.jar"/>
-  </target>
-</project>
diff --git a/schema2beans/build.xml b/schema2beans/build.xml
--- a/schema2beans/build.xml
+++ b/schema2beans/build.xml
@@ -4,7 +4,6 @@
 
 Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
 
-
 The contents of this file are subject to the terms of either the GNU
 General Public License Version 2 only ("GPL") or the Common
 Development and Distribution License("CDDL") (collectively, the
@@ -40,19 +39,49 @@
 Version 2 license, then the option applies only if the new code is
 made subject to such option by the copyright holder.
 -->
+<project name="schema2beans" default="netbeans" basedir=".">
 
-<project name="schema2beans" default="netbeans" basedir=".">
-  <import file="../nbbuild/templates/projectized.xml"/>
+    <import file="../nbbuild/templates/projectized.xml"/>
 
-  <target name="netbeans-extra">
-    <ant dir="dev" target="netbeans"/>
-    <ant dir="anttask" target="jars"/>
-  </target>
-
-  <target name="clean" depends="projectized-common.clean">
-    <!-- Because build includes just rt and we need to clean other libs during real-clean: -->
-    <ant dir="dev" target="clean"/>
-    <ant dir="anttask" target="clean"/>
-  </target>
+    <!-- The genmetadd target should never be part of the regular build.
+         These files should only be generated when we know that schema2beans
+         has no bugs (of importance to this schema file). -->
+    <target name="staticgen" depends="genmetadd,genbeangraph,genconfig"/>
+    <target name="genmetadd" depends="init">
+        <echo message="Generating for metadd.dtd"/>
+        <java classname="org.netbeans.modules.schema2beansdev.GenBeans" fork="true">
+            <classpath>
+                <pathelement path="${build.classes.dir}"/>
+            </classpath>
+            <arg value="-f"/>
+            <arg file="src/org/netbeans/modules/schema2beansdev/metadd/metadd.dtd"/>
+            <arg line="-r src -p org.netbeans.modules.schema2beansdev.metadd -premium -noGenInterfaces -nogenerateTimeStamp"/>
+        </java>
+    </target>
+    <target name="genbeangraph" depends="init">
+        <echo message="Generating for beangraph.xsd"/>
+        <java classname="org.netbeans.modules.schema2beansdev.GenBeans" fork="true">
+            <classpath>
+                <pathelement path="${build.classes.dir}"/>
+            </classpath>
+            <arg value="-f"/>
+            <arg file="src/org/netbeans/modules/schema2beansdev/beangraph/beangraph.xsd "/>
+            <arg line="-xmlschema -r src -p org.netbeans.modules.schema2beansdev.beangraph -premium -noGenInterfaces -nogenerateTimeStamp"/>
+        </java>
+    </target>
+    <target name="genconfig" depends="init">
+        <echo message="Generating for s2bconfig.xsd"/>
+        <java classname="org.netbeans.modules.schema2beansdev.GenBeans" fork="true">
+            <classpath>
+                <pathelement path="${build.classes.dir}"/>
+            </classpath>
+            <arg value="-f"/>
+            <arg file="src/org/netbeans/modules/schema2beansdev/s2bconfig.xsd"/>
+            <arg line="-mdd src/org/netbeans/modules/schema2beansdev/s2bconfig.mdd -xmlschema -r src"/>
+            <arg line="-p org.netbeans.modules.schema2beansdev -premium -noGenInterfaces -noCommonInterface -delegator -delegatedir"/>
+            <arg file="src"/>
+            <arg line="-delegatepackage org.netbeans.modules.s2banttask -generateSwitches -nogenerateTimeStamp"/>
+        </java>
+    </target>
 
 </project>
diff --git a/schema2beans/dev/build.xml b/schema2beans/dev/build.xml
deleted file mode 100644
--- a/schema2beans/dev/build.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
-
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License.  When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
-particular file as subject to the "Classpath" exception as provided
-by Sun in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-Contributor(s):
-
-The Original Software is NetBeans. The Initial Developer of the Original
-Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
-Microsystems, Inc. All Rights Reserved.
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
--->
-
-<project name="schema2beansdev" default="netbeans" basedir=".">
-  <import file="../../nbbuild/default.xml"/>
-
-  <target name="init" depends="default.init">
-    <path id="cp">
-      <pathelement location="${schema2beans.dir}/modules/org-netbeans-modules-schema2beans.jar"/>
-    </path>
-    <property name="schema2beansdev-jar" location="schema2beansdev.jar" />
-  </target>
-
-  <!-- Primary targets. -->
-
-  <target name="netbeans" depends="jars">
-  </target>
-
-  <target name="clean" depends="init">
-    <delete>
-      <fileset dir="src">
-        <include name="**/*.class"/>
-      </fileset>
-    </delete>
-    <delete dir="javadoc"/>
-    <delete file="schema2beansdev.jar"/>
-    <delete file="manifest-subst.mf"/>
-  </target>
-
-
-  <!-- Secondary targets. -->
-
-  <target name="jars" depends="compile">
-    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
-    <copy file="manifest.mf" tofile="manifest-subst.mf"
-	  filtering="on"/>
-    <jar jarfile="schema2beansdev.jar" 
-         manifest="manifest-subst.mf"
-         compress="false">
-      <fileset dir="src">
-        <patternset excludes="**/*.java">
-          <include name="org/netbeans/modules/schema2beansdev/"/>
-        </patternset>
-      </fileset>
-    </jar>
-  </target>
-
-  <target name="compile" depends="init">
-    <property name="build.compiler.debug" value="true"/>
-    <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}" source="1.5">
-	  <classpath refID="cp"/>
-	  <patternset>
-        <include name="org/netbeans/modules/schema2beansdev/"/>
-      </patternset>
-    </javac>
-  </target>
-
-  <target name="test" depends="jars">
-    <ant dir="../../test" antfile="build.xml" />
-  </target>
-
-  <target name="cleantest" depends="clean,jars,test"/>
-
-  <!-- The genmetadd target should never be part of the regular build.
-       These files should only be generated when we know that schema2beans
-       has no bugs (of importance to this schema file). -->
-  <target name="staticgen" depends="genmetadd,genbeangraph,genconfig"/>
-  <target name="genmetadd" depends="init">
-	<echo message="Generating for metadd.dtd"/>
-	<java classname="org.netbeans.modules.schema2beansdev.GenBeans" fork="true">
-	  <classpath>
-		<pathelement path="${schema2beansdev-jar}"/>
-	  </classpath>
-	  <classpath refID="cp"/>
-	  <arg line="-f src/org/netbeans/modules/schema2beansdev/metadd/metadd.dtd -r src -p org.netbeans.modules.schema2beansdev.metadd -premium -noGenInterfaces -nogenerateTimeStamp"/>
-	</java>
-  </target>
-  <target name="genbeangraph" depends="init">
-	<echo message="Generating for beangraph.xsd"/>
-	<java classname="org.netbeans.modules.schema2beansdev.GenBeans" fork="true">
-	  <classpath>
-		<pathelement path="${schema2beansdev-jar}"/>
-	  </classpath>
-	  <classpath refID="cp"/>
-	  <arg line="-f src/org/netbeans/modules/schema2beansdev/beangraph/beangraph.xsd -xmlschema -r src -p org.netbeans.modules.schema2beansdev.beangraph -premium -noGenInterfaces -nogenerateTimeStamp"/>
-	</java>
-  </target>
-  <target name="genconfig" depends="init">
-	<echo message="Generating for s2bconfig.xsd"/>
-	<java classname="org.netbeans.modules.schema2beansdev.GenBeans" fork="true">
-	  <classpath>
-		<pathelement path="${schema2beansdev-jar}"/>
-	  </classpath>
-	  <classpath refID="cp"/>
-	  <arg line="-f src/org/netbeans/modules/schema2beansdev/s2bconfig.xsd -mdd src/org/netbeans/modules/schema2beansdev/s2bconfig.mdd -xmlschema -r src -p org.netbeans.modules.schema2beansdev -premium -noGenInterfaces -noCommonInterface -delegator -delegatedir ../anttask/src -delegatepackage org.netbeans.modules.s2banttask -generateSwitches -nogenerateTimeStamp"/>
-	</java>
-  </target>
-</project>
diff --git a/schema2beans/dev/manifest.mf b/schema2beans/dev/manifest.mf
deleted file mode 100644
--- a/schema2beans/dev/manifest.mf
+++ /dev/null
@@ -1,7 +0,0 @@
-Manifest-Version: 1.0
-OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/schema2beansdev/Bundle.properties
-OpenIDE-Module: org.netbeans.modules.schema2beansdev/1
-OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
-OpenIDE-Module-Specification-Version: 1.3
-OpenIDE-Module-Public-Packages: org.netbeans.modules.schema2beansdev.*, org.netbeans.modules.schema2beansdev.gen.*
-OpenIDE-Module-Module-Dependencies: org.netbeans.modules.schema2beans/1 > 1.7
diff --git a/schema2beans/nbproject/project.properties b/schema2beans/nbproject/project.properties
--- a/schema2beans/nbproject/project.properties
+++ b/schema2beans/nbproject/project.properties
@@ -38,5 +38,7 @@
 # made subject to such option by the copyright holder.
 
 is.autoload=true
-
-test.unit.cp.extra=dev/schema2beansdev.jar
+cp.extra=\
+    ${ant.core.lib}:\
+    ${nb_all}/apisupport.harness/external/openjdk-javac-6-b12.jar
+javac.source=1.5
diff --git a/schema2beans/nbproject/project.xml b/schema2beans/nbproject/project.xml
--- a/schema2beans/nbproject/project.xml
+++ b/schema2beans/nbproject/project.xml
@@ -45,7 +45,13 @@
     <configuration>
         <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
             <code-name-base>org.netbeans.modules.schema2beans</code-name-base>
-            <module-dependencies/>
+            <module-dependencies>
+                <dependency>
+                    <code-name-base>org.openide.util</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                </dependency>
+            </module-dependencies>
             <test-dependencies>
                 <test-type>
                     <name>unit</name>
diff --git a/schema2beans/anttask/src/org/netbeans/modules/s2banttask/S2bConfigDelegator.java b/schema2beans/src/org/netbeans/modules/s2banttask/S2bConfigDelegator.java
rename from schema2beans/anttask/src/org/netbeans/modules/s2banttask/S2bConfigDelegator.java
rename to schema2beans/src/org/netbeans/modules/s2banttask/S2bConfigDelegator.java
diff --git a/schema2beans/anttask/src/org/netbeans/modules/s2banttask/Schema2BeansAntTask.java b/schema2beans/src/org/netbeans/modules/s2banttask/Schema2BeansAntTask.java
rename from schema2beans/anttask/src/org/netbeans/modules/s2banttask/Schema2BeansAntTask.java
rename to schema2beans/src/org/netbeans/modules/s2banttask/Schema2BeansAntTask.java
--- a/schema2beans/anttask/src/org/netbeans/modules/s2banttask/Schema2BeansAntTask.java
+++ b/schema2beans/src/org/netbeans/modules/s2banttask/Schema2BeansAntTask.java
@@ -46,6 +46,7 @@
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Task;
+import org.netbeans.modules.schema2beans.Schema2Beans;
 
 import org.netbeans.modules.schema2beansdev.GenBeans;
 
@@ -55,7 +56,9 @@
  * This class is an ant task which front ends
  * org.netbeans.modules.schema2beansdev.GenBeans.  It creates a Config
  * object and fills it in with data from the build script.
+ * @deprecated Use {@link Schema2Beans} instead.
  */
+@Deprecated
 public class Schema2BeansAntTask extends S2bConfigDelegator {
     public Schema2BeansAntTask() {
         super(new GenBeans.Config());
diff --git a/schema2beans/src/org/netbeans/modules/schema2beans/Schema2Beans.java b/schema2beans/src/org/netbeans/modules/schema2beans/Schema2Beans.java
new file mode 100644
--- /dev/null
+++ b/schema2beans/src/org/netbeans/modules/schema2beans/Schema2Beans.java
@@ -0,0 +1,164 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ *
+ * Contributor(s):
+ *
+ * Portions Copyrighted 2009 Sun Microsystems, Inc.
+ */
+
+package org.netbeans.modules.schema2beans;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Placing this annotation on a {@code package-info.java} generates classes from a schema.
+ * The classes will be generated into the same package.
+ * @since XXX
+ */
+@Retention(RetentionPolicy.SOURCE)
+@Target(ElementType.PACKAGE)
+public @interface Schema2Beans {
+
+    /**
+     * The schema to process.
+     * Might be DTD or XSD format.
+     * <p>The file may be specified as a relative or absolute resource path,
+     * as in {@link Class#getResource} ({@code ../resources} syntax allowed).
+     */
+    String schema();
+
+    /**
+     * Type of schema being processed.
+     */
+    SchemaType schemaType();
+
+    /**
+     * Type of classes to generate.
+     */
+    OutputType outputType(); // cannot set default value due to JRE #6512707
+
+    /**
+     * The meta-DD file to use ({@code *.mdd}).
+     * <p>The file may be specified as a relative or absolute resource path,
+     * as in {@link Class#getResource} ({@code ../resources} syntax allowed).
+     */
+    String mddFile() default "";
+
+    /**
+     * Whether to validate.
+     */
+    boolean validate() default false;
+
+    /**
+     * Whether to remove unreferenced nodes.
+     */
+    boolean removeUnreferencedNodes() default false;
+
+    /**
+     * XXX document
+     */
+    boolean attrProp() default false;
+
+    /**
+     * XXX document
+     */
+    boolean generateHasChanged() default false;
+
+    /**
+     * Generate a common interface between all beans.
+     */
+    String commonInterface() default "";
+
+    /**
+     * XXX document
+     */
+    boolean useInterfaces() default false;
+
+    /**
+     * XXX document
+     */
+    boolean extendBaseBean() default false;
+
+    /**
+     * XXX document
+     */
+    String[] finder() default {};
+
+    /**
+     * XXX document
+     */
+    String docRoot() default "";
+
+    /**
+     * XXX document
+     */
+    boolean generateInterfaces() default false;
+
+    /**
+     * Type of schema being processed.
+     * @see #schemaType
+     */
+    enum SchemaType {
+        /** Document type definition. */
+        DTD,
+        /** XML Schema. */
+        XML_SCHEMA
+    }
+
+    /**
+     * Type of classes to generate.
+     * @see #outputType
+     */
+    enum OutputType {
+        /** Force use of {@link BaseBean}. Runtime required. */
+        TRADITIONAL_BASEBEAN,
+        /** Generate pure JavaBeans that do not need any runtime library support (no {@link BaseBean}). */
+        JAVABEANS
+    }
+
+    /**
+     * Permits multiple schemas to be generated into the same package.
+     * <p>The processor must refuse to recreate any given class, so if there might
+     * be some conflict, put the preferred schema first in the list.
+     */
+    @Retention(RetentionPolicy.SOURCE)
+    @Target(ElementType.PACKAGE)
+    @interface Multiple {
+        Schema2Beans[] value();
+    }
+
+}
diff --git a/schema2beans/dev/src/org/netbeans/modules/schema2beansdev/AbstractCodeGeneratorClass.java b/schema2beans/src/org/netbeans/modules/schema2beansdev/AbstractCodeGeneratorClass.java
rename from schema2beans/dev/src/org/netbeans/modules/schema2beansdev/AbstractCodeGeneratorClass.java
rename to schema2beans/src/org/netbeans/modules/schema2beansdev/AbstractCodeGeneratorClass.java
diff --git a/schema2beans/dev/src/org/netbeans/modules/schema2beansdev/BaseBeansFactory.java b/schema2beans/src/org/netbeans/modules/schema2beansdev/BaseBeansFactory.java
rename from schema2beans/dev/src/org/netbeans/modules/schema2beansdev/BaseBeansFactory.java
rename to schema2beans/src/org/netbeans/modules/schema2beansdev/BaseBeansFactory.java
diff --git a/schema2beans/dev/src/org/netbeans/modules/schema2beansdev/BeanBuilder.java b/schema2beans/src/org/netbeans/modules/schema2beansdev/BeanBuilder.java
rename from schema2beans/dev/src/org/netbeans/modules/schema2beansdev/BeanBuilder.java
rename to schema2beans/src/org/netbeans/modules/schema2beansdev/BeanBuilder.java
diff --git a/schema2beans/dev/src/org/netbeans/modules/schema2beansdev/BeanClass.java b/schema2beans/src/org/netbeans/modules/schema2beansdev/BeanClass.java
rename from schema2beans/dev/src/org/netbeans/modules/schema2beansdev/BeanClass.java
rename to schema2beans/src/org/netbeans/modules/schema2beansdev/BeanClass.java
diff --git a/schema2beans/dev/src/org/netbeans/modules/schema2beansdev/Bundle.properties b/schema2beans/src/org/netbeans/modules/schema2beansdev/Bundle.properties
rename from schema2beans/dev/src/org/netbeans/modules/schema2beansdev/Bundle.properties
rename to schema2beans/src/org/netbeans/modules/schema2beansdev/Bundle.properties
diff --git a/schema2beans/dev/src/org/netbeans/modules/schema2beansdev/CodeGeneratorClass.java b/schema2beans/src/org/netbeans/modules/schema2beansdev/CodeGeneratorClass.java
rename from schema2beans/dev/src/org/netbeans/modules/schema2beansdev/CodeGeneratorClass.java
rename to schema2beans/src/org/netbeans/modules/schema2beansdev/CodeGeneratorClass.java
diff --git a/schema2beans/dev/src/org/netbeans/modules/schema2beansdev/CodeGeneratorFactory.java b/schema2beans/src/org/netbeans/modules/schema2beansdev/CodeGeneratorFactory.java
rename from schema2beans/dev/src/org/netbeans/modules/schema2beansdev/CodeGeneratorFactory.java
rename to schema2beans/src/org/netbeans/modules/schema2beansdev/CodeGeneratorFactory.java
diff --git a/schema2beans/dev/src/org/netbeans/modules/schema2beansdev/DataEnumRestriction.java b/schema2beans/src/org/netbeans/modules/schema2beansdev/DataEnumRestriction.java
rename from schema2beans/dev/src/org/netbeans/modules/schema2beansdev/DataEnumRestriction.java
rename to schema2beans/src/org/netbeans/modules/schema2beansdev/DataEnumRestriction.java
diff --git a/schema2beans/dev/src/org/netbeans/modules/schema2beansdev/DataListRestriction.java b/schema2beans/src/org/netbeans/modules/schema2beansdev/DataListRestriction.java
rename from schema2beans/dev/src/org/netbeans/modules/schema2beansdev/DataListRestriction.java
rename to schema2beans/src/org/netbeans/modules/schema2beansdev/DataListRestriction.java
diff --git a/schema2beans/dev/src/org/netbeans/modules/schema2beansdev/DataTypeRestriction.java b/schema2beans/src/org/netbeans/modules/schema2beansdev/DataTypeRestriction.java
rename from schema2beans/dev/src/org/netbeans/modules/schema2beansdev/DataTypeRestriction.java
rename to schema2beans/src/org/netbeans/modules/schema2beansdev/DataTypeRestriction.java
diff --git a/schema2beans/dev/src/org/netbeans/modules/schema2beansdev/DocDefHandler.java b/schema2beans/src/org/netbeans/modules/schema2beansdev/DocDefHandler.java
rename from schema2beans/dev/src/org/netbeans/modules/schema2beansdev/DocDefHandler.java
rename to schema2beans/src/org/netbeans/modules/schema2beansdev/DocDefHandler.java
diff --git a/schema2beans/dev/src/org/netbeans/modules/schema2beansdev/DocDefParser.java b/schema2beans/src/org/netbeans/modules/schema2beansdev/DocDefParser.java
rename from schema2beans/dev/src/org/netbeans/modules/schema2beansdev/DocDefParser.java
rename to schema2beans/src/org/netbeans/modules/schema2beansdev/DocDefParser.java
--- a/schema2beans/dev/src/org/netbeans/modules/schema2beansdev/DocDefParser.java
+++ b/schema2beans/src/org/netbeans/modules/schema2beansdev/DocDefParser.java
@@ -41,7 +41,6 @@
 
 package org.netbeans.modules.schema2beansdev;
 
-import java.util.*;
 import java.io.*;
 
 import org.netbeans.modules.schema2beans.*;
@@ -101,22 +100,10 @@
         this.handler = handler;
     }
     
-    protected void startupReader() throws java.io.IOException {;
-        if (schemaIn == null) {
-            EntityParser entityParser = new EntityParser(filename);
-            entityParser.parse();
-            reader=entityParser.getReader();
-        }
-        else
-            reader = new InputStreamReader(schemaIn);
-    }
-    
-    public void setFilename(File filename) {
-        this.filename = filename;
-    }
-    
-    public File getFilename() {
-        return filename;
+    protected @Override void startupReader() throws java.io.IOException {
+        EntityParser entityParser = new EntityParser(new InputStreamReader(schemaIn));
+        entityParser.parse();
+        reader = entityParser.getReader();
     }
     
     public void setHandler(DocDefHandler handler) {
diff --git a/schema2beans/dev/src/org/netbeans/modules/schema2beansdev/EntityParser.java b/schema2beans/src/org/netbeans/modules/schema2beansdev/EntityParser.java
rename from schema2beans/dev/src/org/netbeans/modules/schema2beansdev/EntityParser.java
rename to schema2beans/src/org/netbeans/modules/schema2beansdev/EntityParser.java
--- a/schema2beans/dev/src/org/netbeans/modules/schema2beansdev/EntityParser.java
+++ b/schema2beans/src/org/netbeans/modules/schema2beansdev/EntityParser.java
@@ -52,16 +52,21 @@
  */
 public class EntityParser {
     private java.util.Map entityMap;
-    private File fileName;
-    /** Creates a new instance of EntityParser */
-    public EntityParser(File fileName) {
-        this.fileName=fileName;
+    private final String text;
+    public EntityParser(Reader reader) throws IOException {
+        StringWriter w = new StringWriter();
+        char[] buf = new char[4096];
+        int read;
+        while ((read = reader.read(buf)) != -1) {
+            w.write(buf, 0, read);
+        }
+        this.text = w.toString();
         entityMap = new java.util.HashMap();
     }
     /** Parses file for ENTITY declaration, creates map with entities
      */
     public void parse() throws IOException {
-        BufferedReader br = new BufferedReader(new FileReader(fileName));
+        BufferedReader br = new BufferedReader(new StringReader(text));
         String line = null;
         while ((line=br.readLine())!=null) {
             int startPos = line.indexOf("<!ENTITY ");
@@ -99,6 +104,7 @@
                 String val = (String)entityMap.get(entityKey);
 		if (val!=null) {
 		    String newValue = value.substring(0,refStart)+val+value.substring(refEnd+1);
+            // XXX should use config.messageOut instead
 		    System.out.println("found ENTITY: % "+key+" \""+newValue+"\"");
 		    entityMap.put(key,newValue);
 		}
@@ -136,7 +142,7 @@
      */
     public Reader getReader() throws IOException {
         StringBuffer buf = new StringBuffer();
-        BufferedReader br = new BufferedReader(new FileReader(fileName));
+        BufferedReader br = new BufferedReader(new StringReader(text));
         String line = null;
         while ((line=br.readLine())!=null) {
             // removing line(s) with entity declaration
diff --git a/schema2beans/dev/src/org/netbeans/modules/schema2beansdev/GenBeans.java b/schema2beans/src/org/netbeans/modules/schema2beansdev/GenBeans.java
rename from schema2beans/dev/src/org/netbeans/modules/schema2beansdev/GenBeans.java
rename to schema2beans/src/org/netbeans/modules/schema2beansdev/GenBeans.java
diff --git a/schema2beans/dev/src/org/netbeans/modules/schema2beansdev/GeneralParser.java b/schema2beans/src/org/netbeans/modules/schema2beansdev/GeneralParser.java
rename from schema2beans/dev/src/org/netbeans/modules/schema2beansdev/GeneralParser.java
rename to schema2beans/src/org/netbeans/modules/schema2beansdev/GeneralParser.java
diff --git a/schema2beans/dev/src/org/netbeans/modules/schema2beansdev/GraphLink.java b/schema2beans/src/org/netbeans/modules/schema2beansdev/GraphLink.java
rename from schema2beans/dev/src/org/netbeans/modules/schema2beansdev/GraphLink.java
rename to schema2beans/src/org/netbeans/modules/schema2beansdev/GraphLink.java
diff --git a/schema2beans/dev/src/org/netbeans/modules/schema2beansdev/GraphNode.java b/schema2beans/src/org/netbeans/modules/schema2beansdev/GraphNode.java
rename from schema2beans/dev/src/org/netbeans/modules/schema2beansdev/GraphNode.java
rename to schema2beans/src/org/netbeans/modules/schema2beansdev/GraphNode.java
diff --git a/schema2beans/dev/src/org/netbeans/modules/schema2beansdev/HasAnnotation.java b/schema2beans/src/org/netbeans/modules/schema2beansdev/HasAnnotation.java
rename from schema2beans/dev/src/org/netbeans/modules/schema2beansdev/HasAnnotation.java
rename to schema2beans/src/org/netbeans/modules/schema2beansdev/HasAnnotation.java
diff --git a/schema2beans/dev/src/org/netbeans/modules/schema2beansdev/HasPrefixGuesser.java b/schema2beans/src/org/netbeans/modules/schema2beansdev/HasPrefixGuesser.java
rename from schema2beans/dev/src/org/netbeans/modules/schema2beansdev/HasPrefixGuesser.java
rename to schema2beans/src/org/netbeans/modules/schema2beansdev/HasPrefixGuesser.java
diff --git a/schema2beans/dev/src/org/netbeans/modules/schema2beansdev/JavaBeanClass.java b/schema2beans/src/org/netbeans/modules/schema2beansdev/JavaBeanClass.java
rename from schema2beans/dev/src/org/netbeans/modules/schema2beansdev/JavaBeanClass.java
rename to schema2beans/src/org/netbeans/modules/schema2beansdev/JavaBeanClass.java
diff --git a/schema2beans/dev/src/org/netbeans/modules/schema2beansdev/JavaBeansFactory.java b/schema2beans/src/org/netbeans/modules/schema2beansdev/JavaBeansFactory.java
rename from schema2beans/dev/src/org/netbeans/modules/schema2beansdev/JavaBeansFactory.java
rename to schema2beans/src/org/netbeans/modules/schema2beansdev/JavaBeansFactory.java
diff --git a/schema2beans/dev/src/org/netbeans/modules/schema2beansdev/PrefixGuesser.java b/schema2beans/src/org/netbeans/modules/schema2beansdev/PrefixGuesser.java
rename from schema2beans/dev/src/org/netbeans/modules/schema2beansdev/PrefixGuesser.java
rename to schema2beans/src/org/netbeans/modules/schema2beansdev/PrefixGuesser.java
diff --git a/schema2beans/dev/src/org/netbeans/modules/schema2beansdev/S2bConfig.java b/schema2beans/src/org/netbeans/modules/schema2beansdev/S2bConfig.java
rename from schema2beans/dev/src/org/netbeans/modules/schema2beansdev/S2bConfig.java
rename to schema2beans/src/org/netbeans/modules/schema2beansdev/S2bConfig.java
diff --git a/schema2beans/src/org/netbeans/modules/schema2beansdev/Schema2BeansProcessor.java b/schema2beans/src/org/netbeans/modules/schema2beansdev/Schema2BeansProcessor.java
new file mode 100644
--- /dev/null
+++ b/schema2beans/src/org/netbeans/modules/schema2beansdev/Schema2BeansProcessor.java
@@ -0,0 +1,206 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ *
+ * Contributor(s):
+ *
+ * Portions Copyrighted 2009 Sun Microsystems, Inc.
+ */
+
+package org.netbeans.modules.schema2beansdev;
+
+import java.io.ByteArrayOutputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.PrintStream;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+import javax.annotation.processing.AbstractProcessor;
+import javax.annotation.processing.FilerException;
+import javax.annotation.processing.Processor;
+import javax.annotation.processing.RoundEnvironment;
+import javax.annotation.processing.SupportedSourceVersion;
+import javax.lang.model.SourceVersion;
+import javax.lang.model.element.Element;
+import javax.lang.model.element.PackageElement;
+import javax.lang.model.element.TypeElement;
+import javax.tools.Diagnostic.Kind;
+import javax.tools.FileObject;
+import javax.tools.StandardLocation;
+import org.netbeans.modules.schema2beans.Schema2Beans;
+import org.netbeans.modules.schema2beans.Schema2Beans.Multiple;
+import org.netbeans.modules.schema2beansdev.GenBeans.Config;
+import org.openide.util.lookup.ServiceProvider;
+
+@ServiceProvider(service=Processor.class)
+@SupportedSourceVersion(SourceVersion.RELEASE_6)
+public class Schema2BeansProcessor extends AbstractProcessor {
+
+    public @Override Set<String> getSupportedAnnotationTypes() {
+        return new HashSet<String>(Arrays.asList(
+                Schema2Beans.class.getCanonicalName(),
+                Multiple.class.getCanonicalName()));
+    }
+
+    public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
+        if (roundEnv.errorRaised() || roundEnv.processingOver()) {
+            return false;
+        }
+        for (Element e : roundEnv.getElementsAnnotatedWith(Schema2Beans.class)) {
+            handle(e, e.getAnnotation(Schema2Beans.class));
+        }
+        for (Element e : roundEnv.getElementsAnnotatedWith(Multiple.class)) {
+            for (Schema2Beans s2b : e.getAnnotation(Multiple.class).value()) {
+                handle(e, s2b);
+            }
+        }
+        return true;
+    }
+
+    private void handle(final Element e, Schema2Beans s2b) {
+        try {
+            Config config = new Config();
+            config.setAuto(true);
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            PrintStream ps = new PrintStream(baos);
+            config.setMessageOut(ps);
+            final String pkg = ((PackageElement) e).getQualifiedName().toString();
+            config.setPackagePath(pkg);
+            config.setOutputStreamProvider(new GenBeans.OutputStreamProvider() {
+                public OutputStream getStream(String dir, String name, String extension) throws IOException {
+                    if (!dir.replace('\\', '/').endsWith(pkg.replace('.', '/'))) {
+                        throw new IOException("Unexpected dir: " + dir);
+                    }
+                    if (!extension.equals("java")) {
+                        throw new IOException("Unexpected extension: " + extension);
+                    }
+                    String nameAndExt = name + "." + extension;
+                    try {
+                        processingEnv.getFiler().getResource(StandardLocation.SOURCE_OUTPUT, pkg, nameAndExt).openInputStream().close();
+                        throw new IOException("should not get here");
+                    } catch (FilerException x) {
+                        processingEnv.getMessager().printMessage(Kind.WARNING, "ignoring attempt to regenerate " + nameAndExt/*, e*/);
+                        return new ByteArrayOutputStream(); // XXX could check that the same contents are written
+                    } catch (FileNotFoundException x) {
+                        // expected
+                    }
+                    return processingEnv.getFiler().createSourceFile(pkg + "." + name, e).openOutputStream();
+                }
+                public boolean isOlderThan(String dir, String name, String extension, long time) throws IOException {
+                    return true;
+                }
+            });
+            FileObject schema = findResource(s2b.schema(), pkg);
+            processingEnv.getMessager().printMessage(Kind.NOTE, "generating beans for " + schema.getName() + " in " + pkg/*, e*/);
+            config.setFileIn(schema.openInputStream());
+            config.setInputURI(fileObjectToUri(schema).toString());
+            switch (s2b.schemaType()) {
+            case DTD:
+                config.setSchemaType(Config.DTD);
+                break;
+            case XML_SCHEMA:
+                config.setSchemaType(Config.XML_SCHEMA);
+                break;
+            default:
+                assert false;
+            }
+            if (s2b.mddFile().length() > 0) {
+                FileObject mdd = findResource(s2b.mddFile(), pkg);
+                config.setMddIn(mdd.openInputStream());
+            }
+            switch (s2b.outputType()) {
+            case TRADITIONAL_BASEBEAN:
+                config.setOutputType(Config.OUTPUT_TRADITIONAL_BASEBEAN);
+                break;
+            case JAVABEANS:
+                config.setOutputType(Config.OUTPUT_JAVABEANS);
+                break;
+            default:
+                assert false;
+            }
+            config.setGenerateValidate(s2b.validate());
+            config.setRemoveUnreferencedNodes(s2b.removeUnreferencedNodes());
+            config.setAttributesAsProperties(s2b.attrProp());
+            config.setGenerateHasChanged(s2b.generateHasChanged());
+            if (s2b.commonInterface().length() > 0) {
+                config.setGenerateCommonInterface(s2b.commonInterface());
+            }
+            config.setUseInterfaces(s2b.useInterfaces());
+            config.setExtendBaseBean(s2b.extendBaseBean());
+            config.setFinder(s2b.finder()); // XXX refactor BeanBuilder.processFinder to check syntax
+            if (s2b.docRoot().length() > 0) {
+                config.setDocRoot(s2b.docRoot());
+            }
+            config.setGenerateInterfaces(s2b.generateInterfaces());
+            try {
+                GenBeans.doIt(config);
+            } finally {
+                ps.flush();
+                for (String line : baos.toString().split("\n")) {
+                    if (line.length() > 0) {
+                        processingEnv.getMessager().printMessage(Kind.NOTE, line/*, e*/);
+                    }
+                }
+            }
+        } catch (Exception x) {
+            // Oddly, the ERROR is never printed.
+            processingEnv.getMessager().printMessage(Kind.WARNING, x.toString(), e);
+            processingEnv.getMessager().printMessage(Kind.ERROR, "Could not process");
+        }
+    }
+
+    private FileObject findResource(String path, String pkg) throws URISyntaxException, IOException {
+        String abspath;
+        if (path.startsWith("/")) {
+            abspath = path.substring(1);
+        } else {
+            abspath = new URI(null, pkg.replace('.', '/') + "/", null).resolve(new URI(null, path, null)).getPath();
+        }
+        FileObject f = processingEnv.getFiler().getResource(StandardLocation.SOURCE_PATH, "", abspath);
+        return f;
+    }
+
+    /** Workaround for JRE #6419926 */
+    private URI fileObjectToUri(FileObject f) throws URISyntaxException {
+        URI u = f.toUri();
+        if (u.getScheme() == null) {
+            u = new URI("file", u.getPath(), u.getFragment());
+        }
+        return u;
+    }
+
+}
diff --git a/schema2beans/dev/src/org/netbeans/modules/schema2beansdev/SchemaParseException.java b/schema2beans/src/org/netbeans/modules/schema2beansdev/SchemaParseException.java
rename from schema2beans/dev/src/org/netbeans/modules/schema2beansdev/SchemaParseException.java
rename to schema2beans/src/org/netbeans/modules/schema2beansdev/SchemaParseException.java
diff --git a/schema2beans/dev/src/org/netbeans/modules/schema2beansdev/SchemaParser.java b/schema2beans/src/org/netbeans/modules/schema2beansdev/SchemaParser.java
rename from schema2beans/dev/src/org/netbeans/modules/schema2beansdev/SchemaParser.java
rename to schema2beans/src/org/netbeans/modules/schema2beansdev/SchemaParser.java
diff --git a/schema2beans/dev/src/org/netbeans/modules/schema2beansdev/SchemaRep.java b/schema2beans/src/org/netbeans/modules/schema2beansdev/SchemaRep.java
rename from schema2beans/dev/src/org/netbeans/modules/schema2beansdev/SchemaRep.java
rename to schema2beans/src/org/netbeans/modules/schema2beansdev/SchemaRep.java
diff --git a/schema2beans/dev/src/org/netbeans/modules/schema2beansdev/TestListener.java b/schema2beans/src/org/netbeans/modules/schema2beansdev/TestListener.java
rename from schema2beans/dev/src/org/netbeans/modules/schema2beansdev/TestListener.java
rename to schema2beans/src/org/netbeans/modules/schema2beansdev/TestListener.java
diff --git a/schema2beans/dev/src/org/netbeans/modules/schema2beansdev/TreeBuilder.java b/schema2beans/src/org/netbeans/modules/schema2beansdev/TreeBuilder.java
rename from schema2beans/dev/src/org/netbeans/modules/schema2beansdev/TreeBuilder.java
rename to schema2beans/src/org/netbeans/modules/schema2beansdev/TreeBuilder.java
diff --git a/schema2beans/dev/src/org/netbeans/modules/schema2beansdev/TreeParser.java b/schema2beans/src/org/netbeans/modules/schema2beansdev/TreeParser.java
rename from schema2beans/dev/src/org/netbeans/modules/schema2beansdev/TreeParser.java
rename to schema2beans/src/org/netbeans/modules/schema2beansdev/TreeParser.java
diff --git a/schema2beans/dev/src/org/netbeans/modules/schema2beansdev/XMLSchemaParser.java b/schema2beans/src/org/netbeans/modules/schema2beansdev/XMLSchemaParser.java
rename from schema2beans/dev/src/org/netbeans/modules/schema2beansdev/XMLSchemaParser.java
rename to schema2beans/src/org/netbeans/modules/schema2beansdev/XMLSchemaParser.java
diff --git a/schema2beans/dev/src/org/netbeans/modules/schema2beansdev/beangraph/BeanGraph.java b/schema2beans/src/org/netbeans/modules/schema2beansdev/beangraph/BeanGraph.java
rename from schema2beans/dev/src/org/netbeans/modules/schema2beansdev/beangraph/BeanGraph.java
rename to schema2beans/src/org/netbeans/modules/schema2beansdev/beangraph/BeanGraph.java
diff --git a/schema2beans/dev/src/org/netbeans/modules/schema2beansdev/beangraph/CommonBean.java b/schema2beans/src/org/netbeans/modules/schema2beansdev/beangraph/CommonBean.java
rename from schema2beans/dev/src/org/netbeans/modules/schema2beansdev/beangraph/CommonBean.java
rename to schema2beans/src/org/netbeans/modules/schema2beansdev/beangraph/CommonBean.java
diff --git a/schema2beans/dev/src/org/netbeans/modules/schema2beansdev/beangraph/SchemaTypeMappingType.java b/schema2beans/src/org/netbeans/modules/schema2beansdev/beangraph/SchemaTypeMappingType.java
rename from schema2beans/dev/src/org/netbeans/modules/schema2beansdev/beangraph/SchemaTypeMappingType.java
rename to schema2beans/src/org/netbeans/modules/schema2beansdev/beangraph/SchemaTypeMappingType.java
diff --git a/schema2beans/dev/src/org/netbeans/modules/schema2beansdev/beangraph/beangraph.xsd b/schema2beans/src/org/netbeans/modules/schema2beansdev/beangraph/beangraph.xsd
rename from schema2beans/dev/src/org/netbeans/modules/schema2beansdev/beangraph/beangraph.xsd
rename to schema2beans/src/org/netbeans/modules/schema2beansdev/beangraph/beangraph.xsd
diff --git a/schema2beans/dev/src/org/netbeans/modules/schema2beansdev/gen/GenBuffer.java b/schema2beans/src/org/netbeans/modules/schema2beansdev/gen/GenBuffer.java
rename from schema2beans/dev/src/org/netbeans/modules/schema2beansdev/gen/GenBuffer.java
rename to schema2beans/src/org/netbeans/modules/schema2beansdev/gen/GenBuffer.java
diff --git a/schema2beans/dev/src/org/netbeans/modules/schema2beansdev/gen/IndentingWriter.java b/schema2beans/src/org/netbeans/modules/schema2beansdev/gen/IndentingWriter.java
rename from schema2beans/dev/src/org/netbeans/modules/schema2beansdev/gen/IndentingWriter.java
rename to schema2beans/src/org/netbeans/modules/schema2beansdev/gen/IndentingWriter.java
diff --git a/schema2beans/dev/src/org/netbeans/modules/schema2beansdev/gen/JavaUtil.java b/schema2beans/src/org/netbeans/modules/schema2beansdev/gen/JavaUtil.java
rename from schema2beans/dev/src/org/netbeans/modules/schema2beansdev/gen/JavaUtil.java
rename to schema2beans/src/org/netbeans/modules/schema2beansdev/gen/JavaUtil.java
diff --git a/schema2beans/dev/src/org/netbeans/modules/schema2beansdev/gen/JavaWriter.java b/schema2beans/src/org/netbeans/modules/schema2beansdev/gen/JavaWriter.java
rename from schema2beans/dev/src/org/netbeans/modules/schema2beansdev/gen/JavaWriter.java
rename to schema2beans/src/org/netbeans/modules/schema2beansdev/gen/JavaWriter.java
diff --git a/schema2beans/dev/src/org/netbeans/modules/schema2beansdev/gen/WriteIfDifferentOutputStream.java b/schema2beans/src/org/netbeans/modules/schema2beansdev/gen/WriteIfDifferentOutputStream.java
rename from schema2beans/dev/src/org/netbeans/modules/schema2beansdev/gen/WriteIfDifferentOutputStream.java
rename to schema2beans/src/org/netbeans/modules/schema2beansdev/gen/WriteIfDifferentOutputStream.java
diff --git a/schema2beans/dev/src/org/netbeans/modules/schema2beansdev/gen/XMLWriter.java b/schema2beans/src/org/netbeans/modules/schema2beansdev/gen/XMLWriter.java
rename from schema2beans/dev/src/org/netbeans/modules/schema2beansdev/gen/XMLWriter.java
rename to schema2beans/src/org/netbeans/modules/schema2beansdev/gen/XMLWriter.java
diff --git a/schema2beans/dev/src/org/netbeans/modules/schema2beansdev/metadd/CommonBean.java b/schema2beans/src/org/netbeans/modules/schema2beansdev/metadd/CommonBean.java
rename from schema2beans/dev/src/org/netbeans/modules/schema2beansdev/metadd/CommonBean.java
rename to schema2beans/src/org/netbeans/modules/schema2beansdev/metadd/CommonBean.java
diff --git a/schema2beans/dev/src/org/netbeans/modules/schema2beansdev/metadd/MetaDD.java b/schema2beans/src/org/netbeans/modules/schema2beansdev/metadd/MetaDD.java
rename from schema2beans/dev/src/org/netbeans/modules/schema2beansdev/metadd/MetaDD.java
rename to schema2beans/src/org/netbeans/modules/schema2beansdev/metadd/MetaDD.java
diff --git a/schema2beans/dev/src/org/netbeans/modules/schema2beansdev/metadd/MetaElement.java b/schema2beans/src/org/netbeans/modules/schema2beansdev/metadd/MetaElement.java
rename from schema2beans/dev/src/org/netbeans/modules/schema2beansdev/metadd/MetaElement.java
rename to schema2beans/src/org/netbeans/modules/schema2beansdev/metadd/MetaElement.java
diff --git a/schema2beans/dev/src/org/netbeans/modules/schema2beansdev/metadd/MetaProperty.java b/schema2beans/src/org/netbeans/modules/schema2beansdev/metadd/MetaProperty.java
rename from schema2beans/dev/src/org/netbeans/modules/schema2beansdev/metadd/MetaProperty.java
rename to schema2beans/src/org/netbeans/modules/schema2beansdev/metadd/MetaProperty.java
diff --git a/schema2beans/dev/src/org/netbeans/modules/schema2beansdev/metadd/gen.ksh b/schema2beans/src/org/netbeans/modules/schema2beansdev/metadd/gen.ksh
rename from schema2beans/dev/src/org/netbeans/modules/schema2beansdev/metadd/gen.ksh
rename to schema2beans/src/org/netbeans/modules/schema2beansdev/metadd/gen.ksh
diff --git a/schema2beans/dev/src/org/netbeans/modules/schema2beansdev/metadd/metadd.dtd b/schema2beans/src/org/netbeans/modules/schema2beansdev/metadd/metadd.dtd
rename from schema2beans/dev/src/org/netbeans/modules/schema2beansdev/metadd/metadd.dtd
rename to schema2beans/src/org/netbeans/modules/schema2beansdev/metadd/metadd.dtd
diff --git a/schema2beans/dev/src/org/netbeans/modules/schema2beansdev/s2bconfig.mdd b/schema2beans/src/org/netbeans/modules/schema2beansdev/s2bconfig.mdd
rename from schema2beans/dev/src/org/netbeans/modules/schema2beansdev/s2bconfig.mdd
rename to schema2beans/src/org/netbeans/modules/schema2beansdev/s2bconfig.mdd
diff --git a/schema2beans/dev/src/org/netbeans/modules/schema2beansdev/s2bconfig.xsd b/schema2beans/src/org/netbeans/modules/schema2beansdev/s2bconfig.xsd
rename from schema2beans/dev/src/org/netbeans/modules/schema2beansdev/s2bconfig.xsd
rename to schema2beans/src/org/netbeans/modules/schema2beansdev/s2bconfig.xsd
diff --git a/schema2beans/dev/src/org/netbeans/modules/schema2beansdev/xmlschema.xsd b/schema2beans/src/org/netbeans/modules/schema2beansdev/xmlschema.xsd
rename from schema2beans/dev/src/org/netbeans/modules/schema2beansdev/xmlschema.xsd
rename to schema2beans/src/org/netbeans/modules/schema2beansdev/xmlschema.xsd