Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Bug 252615

Summary: Java EE 6 models
Product: [WebTools] WTP Java EE Tools Reporter: Kaloyan Raev <kaloyan>
Component: jst.j2eeAssignee: Carl Anderson <ccc>
Status: RESOLVED FIXED QA Contact: Chuck Bridgham <cbridgha>
Severity: enhancement    
Priority: P3 CC: ccc, dimitar.giormov, jsholl
Version: 3.1Keywords: plan
Target Milestone: 3.2 M3Flags: cbridgha: review+
jsholl: review+
Hardware: PC   
OS: All   
Whiteboard: JavaEE6
Bug Depends on: 262038, 290822    
Bug Blocks: 299598, 400481    
Attachments:
Description Flags
Update org.eclipse.jst.j2ee.core version id to 1.2.0
none
The Java EE 5 and 6 models - 1 of 3
none
The Java EE 5 and 6 models - 2 of 3
none
The Java EE 5 and 6 models - 3 of 3
none
Add EPL to new files none

Description Kaloyan Raev CLA 2008-10-29 12:33:10 EDT
EMF models need to be generated from the XML schemas of the Java EE 6 deployment descriptors.
Comment 1 Carl Anderson CLA 2009-01-29 14:11:20 EST
Decommitting Java EE 6 support for WTP 3.1
Comment 2 Carl Anderson CLA 2009-09-17 00:05:30 EDT
Recommitting Java EE 6 support for WTP 3.2.
Comment 3 Carl Anderson CLA 2009-09-24 22:12:11 EDT
This will soon be committed.  Things to be aware of:

We will be moving the plugin version id to 1.2.0.  This is an increase of the minor version number.

We are moving the EMF compliance level to EMF 2.5.  That allows us access to javax.xml.namespace.QName (We will be deprecating org.eclipse.jst.j2ee.common.QName)

We are moving the Java Compliance level to 5.0.  The biggest impact here is that previously generic types will now have specific type association, but the effect of this outside of the models themselves is minimal.
Comment 4 Carl Anderson CLA 2009-09-28 22:13:05 EDT
Created attachment 148288 [details]
Update org.eclipse.jst.j2ee.core version id to 1.2.0

This patch will be committed on Oct. 1st.  (Previously, I had stated "after the WTP 3.2 declare on Oct. 1st", but there is no declare this week, so I will commit this first thing Thursday.)
Comment 5 Carl Anderson CLA 2009-10-14 17:46:46 EDT
Created attachment 149599 [details]
The Java EE 5 and 6 models - 1 of 3

There are slight changes here to note.  For instance, while EnvEntry can still have an EnvEntryType set, it is now stored as a String.  (In Java EE 6, the type of an EnvEntry has been opened wide, whereas in Java EE 5, it was quite limited.)  This means that, for comparison purposes, you will need to call EnvEntryType.getLiteral() to compare it to the String stored in EnvEntry.

Also, ServiceRef.getServiceQname() now returns a javax.xml.namespace.QName instead of just an Object.

I have successfully run the Java EE JUnit bucket with this patch.
Comment 6 Carl Anderson CLA 2009-10-14 17:48:02 EDT
Created attachment 149600 [details]
The Java EE 5 and 6 models - 2 of 3
Comment 7 Carl Anderson CLA 2009-10-14 17:49:09 EDT
Created attachment 149601 [details]
The Java EE 5 and 6 models - 3 of 3
Comment 8 Carl Anderson CLA 2009-10-14 17:54:39 EDT
This includes the models for:

Application 6.0
ApplicationClient 6.0
Connector 1.6
Ejb 3.1
JSP 2.2
WebApp 3.0
WebFragment 3.0
Comment 9 Carl Anderson CLA 2009-10-14 18:09:33 EDT
Also to note:
The third model patch contains the updates to the EJB model as well as various updates to other WTP classes to properly work with the updated Java EE 5/6 models.
Comment 10 Kaloyan Raev CLA 2009-10-15 11:06:48 EDT
Dimitar, could you take a look at Carl's modification in the model mergers (patch 3 of 3). We just want to be sure that there is nothing wrong.
Comment 11 Chuck Bridgham CLA 2009-10-15 14:51:15 EDT
I have reviewed these changes...  approved
Comment 12 Carl Anderson CLA 2009-10-15 23:29:01 EDT
Created attachment 149713 [details]
Add EPL to new files

This patch adds the EPL copyright information to the newly generated files.
It also moves the JcaFactory, WebAppFactory, and WebFragmentFactory down from the internal.metadata package (where EMF likes to generate them) down to the base package, which makes those three the same as all of the other factory classes.
Comment 13 Carl Anderson CLA 2009-11-19 11:02:38 EST
This was committed and released to HEAD for WTP 3.2 M3