Updated to sapphire build 0.5.x#206

liferay · Apr 24, 2012 · 73ee9bf · 73ee9bf
1 parent dc98484
commit 73ee9bf
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/eclipse/pom.xml b/eclipse/pom.xml
@@ -100,7 +100,7 @@
                 <eclipse-site>http://download.eclipse.org/releases/helios</eclipse-site>
                 <eclipse-project-update-site>http://download.eclipse.org/eclipse/updates/3.6</eclipse-project-update-site>
                 <wtp-site>http://download.eclipse.org/webtools/repository/helios</wtp-site>
-                <sapphire-site>https://hudson.eclipse.org/hudson/job/sapphire-0.5.x/203/artifact/build/repository</sapphire-site>
+                <sapphire-site>https://hudson.eclipse.org/hudson/job/sapphire-0.5.x/206/artifact/build/repository</sapphire-site>
                 <platform-version>[3.6,3.7)</platform-version>
             </properties>
             <repositories>
@@ -142,7 +142,7 @@
                 <mpc-site>http://download.eclipse.org/mpc/indigo/</mpc-site>
                 <datatools-site>http://download.eclipse.org/datatools/updates</datatools-site>
                 <xsd-site>file:../../liferay-ide/eclipse/target-platform/xsd</xsd-site>
-                <sapphire-site>https://hudson.eclipse.org/hudson/job/sapphire-0.5.x/203/artifact/build/repository</sapphire-site>
+                <sapphire-site>https://hudson.eclipse.org/hudson/job/sapphire-0.5.x/206/artifact/build/repository</sapphire-site>
                 <platform-version>[3.7,3.8)</platform-version>
             </properties>
             <repositories>
@@ -223,7 +223,7 @@
 			<repository>
 				<id>sapphire</id>
 				<layout>p2</layout>
-				<url>https://hudson.eclipse.org/hudson/job/sapphire-0.5.x/203/artifact/build/repository</url>
+				<url>https://hudson.eclipse.org/hudson/job/sapphire-0.5.x/206/artifact/build/repository</url>
 			</repository>
 			<repository>
 				<id>wtp</id>

diff --git a/...ore/src/com/liferay/ide/eclipse/service/core/model/internal/RelationshipsBindingImpl.java b/...ore/src/com/liferay/ide/eclipse/service/core/model/internal/RelationshipsBindingImpl.java
@@ -108,7 +108,11 @@ private void refreshRelationships()
         for( IEntity entity : serviceBuilder().getEntities() )
         {
             IColumn primaryKeyColumn = findPrimaryKey( entity );
-            primaryKeys.put( primaryKeyColumn.getName().getContent(), entity.getName().getContent() );
+
+            if( primaryKeyColumn != null && !empty( primaryKeyColumn.getName().getContent() ) )
+            {
+                primaryKeys.put( primaryKeyColumn.getName().getContent(), entity.getName().getContent() );
+            }
         }
 
         for( IEntity entity : serviceBuilder().getEntities() )

diff --git a/...liferay.ide.eclipse.service.ui/src/com/liferay/ide/eclipse/service/ui/ServiceBuilder.sdef b/...liferay.ide.eclipse.service.ui/src/com/liferay/ide/eclipse/service/ui/ServiceBuilder.sdef
@@ -1018,7 +1018,7 @@ development of services.</content>
         <guides>
             <visible>true</visible>
         </guides>
-        <layout-storage>workspace</layout-storage>
+        <layout-storage>project</layout-storage>
     </diagram-page>
 
 </definition>