Jesse Glick <jglick@netbeans.org> [Fri, 16 Jul 2010 14:21:50 -0400] rev 4011
Merged default into maven-dev.
Made no attempt to fix compilability or other semantic errors.
Conflict markers left for now in:
maven.apisupport/src/org/netbeans/modules/maven/apisupport/MavenNbModuleImpl.java
maven.embedder/src/org/netbeans/modules/maven/embedder/EmbedderFactory.java
maven.grammar/src/org/netbeans/modules/maven/grammar/MavenProjectGrammar.java
maven.indexer/src/org/netbeans/modules/maven/indexer/NexusRepositoryIndexerImpl.java
maven.model/test/unit/src/org/netbeans/modules/maven/pom/ModelTest.java
maven/src/org/netbeans/modules/maven/ActionProviderImpl.java
maven/src/org/netbeans/modules/maven/execute/MavenJavaExecutor.java
Jesse Glick <jglick@netbeans.org> [Fri, 16 Jul 2010 11:47:36 -0400] rev 4010
No longer want to treat this anonymous branch as part of the default branch.
Jesse Glick <jglick@netbeans.org> [Wed, 07 Jul 2010 11:33:54 -0400] rev 4009
Forbid backslashes in attribute names, as these are interpreted specially by MultiFileSystem.
Jesse Glick <jglick@netbeans.org> [Mon, 21 Jun 2010 17:15:31 -0400] rev 4008
Updating BSD-style license headers for samples (excluding cnd*, to be done by thp).
Jesse Glick <jglick@netbeans.org> [Mon, 21 Jun 2010 16:20:28 -0400] rev 4007
Second pass Sun -> Oracle copyright update.
(Module owners: make sure your IDE's license template is correct.)
binuanand@netbeans.org [Thu, 17 Jun 2010 11:43:44 +0530] rev 4006
6855396/6.3 DB2 AS400 Stored Procedure Resultset shows 0 and is grayed out for edit in WSDL wizard.
Vladimir Yaroslavskiy <yaroslavskiy@netbeans.org> [Fri, 11 Jun 2010 13:01:41 +0400] rev 4005
Fix path to jbi libraries
Vladimir Yaroslavskiy <yaroslavskiy@netbeans.org> [Fri, 11 Jun 2010 09:58:01 +0400] rev 4004
Set dependency soa,kit -> xml.kit
Vladimir Yaroslavskiy <yaroslavskiy@netbeans.org> [Thu, 10 Jun 2010 17:36:50 +0400] rev 4003
[Bug #187252] Assertion Error(BpelModelImpl.undoableEditHappened) occurs after the 'Fix Namespaces' invoked
Vladimir Yaroslavskiy <yaroslavskiy@netbeans.org> [Thu, 10 Jun 2010 17:12:12 +0400] rev 4002
Fix pojo library