From e2c462afcf82dd72e443b2ec6f9ac02ce5eb629f Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Sun, 13 Mar 2011 13:24:15 +0000 Subject: [PATCH] SLC JCR git-svn-id: https://svn.argeo.org/slc/trunk@4290 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- demo/slc-client-rcp-dev.product | 11 ++-- demo/slc-client-rcp.product | 10 ++-- .../META-INF/MANIFEST.MF | 3 +- .../argeo/slc/client/ui/ClientUiPlugin.java | 0 .../org.argeo.slc.client.commons/.classpath | 7 --- .../org.argeo.slc.client.commons/.project | 28 ---------- .../.settings/org.eclipse.jdt.core.prefs | 8 --- .../META-INF/MANIFEST.MF | 12 ----- .../build.properties | 6 --- .../icons/archive.png | Bin 985 -> 0 bytes .../icons/computer.png | Bin 1146 -> 0 bytes .../icons/error.gif | Bin 350 -> 0 bytes .../icons/folder.png | Bin 397 -> 0 bytes .../icons/passed.gif | Bin 76 -> 0 bytes .../icons/processes.gif | Bin 586 -> 0 bytes .../icons/system.png | Bin 3776 -> 0 bytes .../org.argeo.slc.client.commons/pom.xml | 51 ------------------ .../META-INF/MANIFEST.MF | 1 - .../runtime/org.argeo.slc.client.core/pom.xml | 12 +---- .../ResultDetailLabelProvider.java | 14 ++--- eclipse/runtime/pom.xml | 1 - .../main/java/org/argeo/slc/jcr/JcrAgent.java | 37 +++++++++++++ .../main/java/org/argeo/slc/jcr/SlcTypes.java | 6 +++ 23 files changed, 68 insertions(+), 139 deletions(-) rename eclipse/{runtime/org.argeo.slc.client.commons => plugins/org.argeo.slc.client.ui}/src/main/java/org/argeo/slc/client/ui/ClientUiPlugin.java (100%) delete mode 100644 eclipse/runtime/org.argeo.slc.client.commons/.classpath delete mode 100644 eclipse/runtime/org.argeo.slc.client.commons/.project delete mode 100644 eclipse/runtime/org.argeo.slc.client.commons/.settings/org.eclipse.jdt.core.prefs delete mode 100644 eclipse/runtime/org.argeo.slc.client.commons/META-INF/MANIFEST.MF delete mode 100644 eclipse/runtime/org.argeo.slc.client.commons/build.properties delete mode 100644 eclipse/runtime/org.argeo.slc.client.commons/icons/archive.png delete mode 100644 eclipse/runtime/org.argeo.slc.client.commons/icons/computer.png delete mode 100644 eclipse/runtime/org.argeo.slc.client.commons/icons/error.gif delete mode 100644 eclipse/runtime/org.argeo.slc.client.commons/icons/folder.png delete mode 100644 eclipse/runtime/org.argeo.slc.client.commons/icons/passed.gif delete mode 100644 eclipse/runtime/org.argeo.slc.client.commons/icons/processes.gif delete mode 100644 eclipse/runtime/org.argeo.slc.client.commons/icons/system.png delete mode 100644 eclipse/runtime/org.argeo.slc.client.commons/pom.xml create mode 100644 runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/JcrAgent.java create mode 100644 runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/SlcTypes.java diff --git a/demo/slc-client-rcp-dev.product b/demo/slc-client-rcp-dev.product index 07f002c97..1fbadc765 100644 --- a/demo/slc-client-rcp-dev.product +++ b/demo/slc-client-rcp-dev.product @@ -166,11 +166,13 @@ + + @@ -183,6 +185,7 @@ + @@ -202,8 +205,8 @@ - - + + @@ -228,8 +231,8 @@ - - + + diff --git a/demo/slc-client-rcp.product b/demo/slc-client-rcp.product index b0c48b16f..ba5646b35 100644 --- a/demo/slc-client-rcp.product +++ b/demo/slc-client-rcp.product @@ -157,9 +157,12 @@ + + + @@ -169,6 +172,7 @@ + @@ -177,7 +181,7 @@ - + @@ -186,11 +190,12 @@ - + + @@ -256,7 +261,6 @@ - diff --git a/eclipse/plugins/org.argeo.slc.client.ui/META-INF/MANIFEST.MF b/eclipse/plugins/org.argeo.slc.client.ui/META-INF/MANIFEST.MF index d380602a7..6b1039d1e 100644 --- a/eclipse/plugins/org.argeo.slc.client.ui/META-INF/MANIFEST.MF +++ b/eclipse/plugins/org.argeo.slc.client.ui/META-INF/MANIFEST.MF @@ -10,7 +10,8 @@ Require-Bundle: org.eclipse.ui;resolution:=optional, org.eclipse.rap.ui.workbench;resolution:=optional Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Export-Package: org.argeo.slc.client.ui.listeners, +Export-Package: org.argeo.slc.client.ui, + org.argeo.slc.client.ui.listeners, org.argeo.slc.client.ui.perspectives, org.argeo.slc.client.ui.views Import-Package: org.apache.commons.io;version="1.4.0", diff --git a/eclipse/runtime/org.argeo.slc.client.commons/src/main/java/org/argeo/slc/client/ui/ClientUiPlugin.java b/eclipse/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/ClientUiPlugin.java similarity index 100% rename from eclipse/runtime/org.argeo.slc.client.commons/src/main/java/org/argeo/slc/client/ui/ClientUiPlugin.java rename to eclipse/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/ClientUiPlugin.java diff --git a/eclipse/runtime/org.argeo.slc.client.commons/.classpath b/eclipse/runtime/org.argeo.slc.client.commons/.classpath deleted file mode 100644 index 92f19d2ff..000000000 --- a/eclipse/runtime/org.argeo.slc.client.commons/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/eclipse/runtime/org.argeo.slc.client.commons/.project b/eclipse/runtime/org.argeo.slc.client.commons/.project deleted file mode 100644 index 377e3265c..000000000 --- a/eclipse/runtime/org.argeo.slc.client.commons/.project +++ /dev/null @@ -1,28 +0,0 @@ - - - org.argeo.slc.client.commons - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - - diff --git a/eclipse/runtime/org.argeo.slc.client.commons/.settings/org.eclipse.jdt.core.prefs b/eclipse/runtime/org.argeo.slc.client.commons/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index c1d561a93..000000000 --- a/eclipse/runtime/org.argeo.slc.client.commons/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,8 +0,0 @@ -#Mon Nov 08 17:00:09 CET 2010 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.5 diff --git a/eclipse/runtime/org.argeo.slc.client.commons/META-INF/MANIFEST.MF b/eclipse/runtime/org.argeo.slc.client.commons/META-INF/MANIFEST.MF deleted file mode 100644 index 37f8461eb..000000000 --- a/eclipse/runtime/org.argeo.slc.client.commons/META-INF/MANIFEST.MF +++ /dev/null @@ -1,12 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: Client commons -Bundle-SymbolicName: org.argeo.slc.client.commons;singleton:=true -Bundle-Version: 0.13.1.SNAPSHOT -Require-Bundle: org.eclipse.ui;resolution:=optional, - org.eclipse.core.runtime;resolution:=optional, - org.eclipse.rap.ui;resolution:=optional, - org.eclipse.rap.ui.workbench;resolution:=optional -Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Export-Package: org.argeo.slc.client.ui diff --git a/eclipse/runtime/org.argeo.slc.client.commons/build.properties b/eclipse/runtime/org.argeo.slc.client.commons/build.properties deleted file mode 100644 index 5a20aff02..000000000 --- a/eclipse/runtime/org.argeo.slc.client.commons/build.properties +++ /dev/null @@ -1,6 +0,0 @@ -source.. = src/main/java -output.. = target/classes -bin.includes = META-INF/,\ - .,\ - icons/ - \ No newline at end of file diff --git a/eclipse/runtime/org.argeo.slc.client.commons/icons/archive.png b/eclipse/runtime/org.argeo.slc.client.commons/icons/archive.png deleted file mode 100644 index fb36f360b6be4c937021cc662a969a57d2ecd3e2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 985 zcmV;~119{5P)n+PUioT~<5V)$E+#d}n6%5HsUZT;h>X z0jT4SjnzB2{rwkjm0W2Mc(@w^0mPjrKpigtw6bjdr8htPs+&W{OY!mhulGOm;yYWT z7b+&vIfw*=09J2(4rUJ`>cFY}P6U{Nzn5;`8-MqMFa4Q{uRT5WY^C{~Nq@_bb}jDf z?`uQw&_~oxAWd>{WMt$jfS=CVQqV+qUb>oC3tek;gGXM7A;y)qZJfV zFVXZ8&0L_F3p6r9WL*E~y;setilv~+A9wGlR^vVZZr`2eGX8(wh3Ol}8nqID>;#yE zsIzY%W(RE`Gx!t(M=*DiaXYQ)qm)Ty1;t}yW3Jh3s#l)BqNXNB*jh*3pe*y)*{_2@ zAYzmUO2-m0NXVA8J$V7Vx3||DLMZ+C)0&gB*CDJcsznZ|a+I7xqnX26*YS77DC2Lu z{C07Ui71aT4jw#cYNZVe;fN2n%MnT&Y#pS~+Q3EuR$i zw!Bf=WLjBwxG01OGJw$r+8BTojCJ4`+fD7nd1)RLnh5|aD=VIevSykaAysB<3C21Y z>#)7w!tWdVFxEh8gO+Ffy1IirilZ3o9E8*b@X=H#rFL7n9|y_YT6?7A$tN!0?&`nj zaS~w0xjup|TMV7=EtI2`$@GL`0GOVh-VGr}1_k3B4$V1-t51z0%>b!1lyMllG~8C& zWyaX_RK<&ni&1O+50MN2AN!Hpmb|-$2 zvauLCf37fQ-QOwYVvXnK=ETy{lHA$Z(E#MVwe3%L?`PwA?sW)3hY(eaQALiDnF*bv zM+jmmL{v%yC8b~gYx~yB8$-Q=gM(SMTJHq)$8FWQhbW?9;ba!ELWdL_~cP?peYja~^ zaAhuUa%Y?FJQ@H11NTWpK~y-6t(D7VnFx)U8{$zB>87@0=1<<@CF!b^wMu(*n?v56+%>ePQpybH>=og5Kt51yI$S<~KjL zY||@$T=~i+Niu)Wj(fMg_4X;YY`z;X7z4%_5Q7mA5kv$KKnX!nRa8MW5JEr|(zMCR zlP`01aWQcyG8&E8y=ylM`xda)mfc{D#aM$e7GnfK&=NQVPw)XBJl+Sq_gwnv5~I-? zsH&U9-|zQnx7#@DaL!_#!&!@U7Uvw+T8uG-5J8Hfz!#pvdwfw)6rSO52q=m&1zuh4 z(QdVH&fU_jD-W_35rgUkcmlZIJDoPFk#47`0Cc-Ok|ZesE4a!8(BZ5pITuhRgg}<( zH0ljjS}UY!O0(HyI2iKci!T5~DpaA{?c%+sQYoXYIIMM3zKx0EjmKjejXF1O)ESS* zLn;zJ<#C|*$%6nTMjZfbHj@nf&oqtoe> z{?w@pj5QcBh>_C8pg~I!qmbVF>7FQFw3~oVm7V5g2>&~WZP?&Yk8iLBuNx6%d)}J^3wIwr{9UIQ6EG^P$j6&5vPennkCAhYpTJEh!-)4 z;DDLs=F&=06u(PZHaD~JaFKCL?gfP%@e4Za z7j!fz^mBg6Cm<>)Iqd2GAv*PabjlI$z{B2wpAs@ZBxHU{%e_=seQ(b4%iWD9GU85T z#vRX$JCT!crab5N()q_zVvom19gmMb79V{tFY9Y-)92QvhpEX&qauz*MLs-q=>Px! z3}gYtpDc_F47v7O@vFB`qe}(^LZldT0EV8>Vg_9 zLJJQmK3X=#VuqVqOJj;^TG)i+hd&0SPGDu0Xl7#d(B)+m7ZYRT^^oKinmn1O-c?d$ wGK(mSkg(`@Cf|62_ON9lcoOJ}bmOHOv5R7r!u*hlEj`sZrbR8M20XzVCnE(I) diff --git a/eclipse/runtime/org.argeo.slc.client.commons/icons/folder.png b/eclipse/runtime/org.argeo.slc.client.commons/icons/folder.png deleted file mode 100644 index 6937ed4a3f2ead85a30b5a3ebf451d44e636f0ab..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 397 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf2?p zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR49O@E7XGy2`RdXez*b@6vKm$k3FaP!4kbGF&t=DrMTbK-lq zUrTc~V0^%*K3)Iu!K21ktv41jm%sVA(&?Afx9Ze4-%lO;TF&3@()g{ft+&5EM!q9$ z!#IV+KWWK0UV6k5|b>{SE!fJwNTX?MAPGFtTII}~|pfm3j^Nf~GD<>VMxnWu8C>LYGk?k$b&z8+$4Uc}*p~PeJ(D@qf-;vpyH|7hx#0Ky_n+@Jtkk>AWWfHU nmO13W+yggQJQAZ^o%@>w*~=tO0mX7=r)+ diff --git a/eclipse/runtime/org.argeo.slc.client.commons/icons/processes.gif b/eclipse/runtime/org.argeo.slc.client.commons/icons/processes.gif deleted file mode 100644 index 364c0e70b1d6dc48f9d9abfceafbb4f63e5e1edb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 586 zcmZ?wbhEHb6krfwc*el6W%tD&KmUCB_Pefs%iNVm(`#3L`uh9Zk3TTdfM8Hb2nXEy7Tt)cRyde`|-ygpG`u5}Z!`D9^y!!t5&5tK+PqXU%vnDpS5D*?Bx$%1I52TfB*C4 zho3Lr|9Jo9*Qam4r_5RU^xco=?|;1d`19kp-=Dty`uOeF_g{Zz%wJ?aBVon4?KL}U z=PjDIXzA<~E2ghqJ!Rv%iCZ`H?cLhBb5qa$Z5{vr|7RG2K=CIFBLjmogAT~;pg3V* zU*6#C?9|fQ*3#7Ez|qs&=g{fw$YEh_(bwZR(Vo%V(wvc%nT5gBexjZ1R0~=5wQKDr z+A^tZW!kbu#de~N$!c9=Ha2M^n~Byk^UQS?E#bAEXeGK@^s17wsMSO>DMP8dckgML zP1Ms|ZJ^B~EF!5lQC0tx{#gcn)rnjRs}(d96cimaI$9DN+l4u7Z3-qFXzuiIHmI5L XgV9NeM?!&bXM&>>OK%esBZD;nX%XK6 diff --git a/eclipse/runtime/org.argeo.slc.client.commons/icons/system.png b/eclipse/runtime/org.argeo.slc.client.commons/icons/system.png deleted file mode 100644 index 71f44d0ce611ea1fc3241bcf2df4d68905771082..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3776 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 - 4.0.0 - - org.argeo.slc.eclipse - runtime - 0.13.1-SNAPSHOT - .. - - org.argeo.slc.client.commons - SLC Eclipse Commons - jar - - - - org.argeo.slc.runtime - org.argeo.slc.core - ${version.slc} - - - - org.argeo.slc.runtime - org.argeo.slc.server - ${version.slc} - - - - org.argeo.commons.eclipse - org.argeo.eclipse.ui - ${version.argeo-commons} - - - - - org.argeo.commons.eclipse - org.argeo.eclipse.dep.rcp - ${version.argeo-commons} - provided - - - - org.eclipse.core - org.eclipse.core.runtime - - - org.eclipse.swt - org.eclipse.swt.gtk.linux.x86_64 - - - diff --git a/eclipse/runtime/org.argeo.slc.client.core/META-INF/MANIFEST.MF b/eclipse/runtime/org.argeo.slc.client.core/META-INF/MANIFEST.MF index a79376c48..f23e5faf8 100644 --- a/eclipse/runtime/org.argeo.slc.client.core/META-INF/MANIFEST.MF +++ b/eclipse/runtime/org.argeo.slc.client.core/META-INF/MANIFEST.MF @@ -13,7 +13,6 @@ Import-Package: org.apache.commons.io;version="1.4.0", org.apache.commons.logging;version="1.1.1", org.argeo.eclipse.spring, org.argeo.eclipse.ui, - org.argeo.slc.client.ui, org.argeo.slc.core.structure.tree, org.argeo.slc.core.test.tree, org.argeo.slc.dao.process, diff --git a/eclipse/runtime/org.argeo.slc.client.core/pom.xml b/eclipse/runtime/org.argeo.slc.client.core/pom.xml index f622bf187..54dc62515 100644 --- a/eclipse/runtime/org.argeo.slc.client.core/pom.xml +++ b/eclipse/runtime/org.argeo.slc.client.core/pom.xml @@ -8,17 +8,9 @@ .. org.argeo.slc.client.core - SLC Eclipse core + SLC Eclipse Core jar - - - - - org.argeo.slc.eclipse - org.argeo.slc.client.commons - ${version.slc} - - + org.argeo.commons.eclipse diff --git a/eclipse/runtime/org.argeo.slc.client.core/src/main/java/org/argeo/slc/client/contentprovider/ResultDetailLabelProvider.java b/eclipse/runtime/org.argeo.slc.client.core/src/main/java/org/argeo/slc/client/contentprovider/ResultDetailLabelProvider.java index 01e506b51..a1db51ba5 100644 --- a/eclipse/runtime/org.argeo.slc.client.core/src/main/java/org/argeo/slc/client/contentprovider/ResultDetailLabelProvider.java +++ b/eclipse/runtime/org.argeo.slc.client.core/src/main/java/org/argeo/slc/client/contentprovider/ResultDetailLabelProvider.java @@ -3,7 +3,6 @@ package org.argeo.slc.client.contentprovider; import org.argeo.eclipse.ui.TreeParent; import org.argeo.slc.client.contentprovider.ResultDetailContentProvider.ResultPartNode; import org.argeo.slc.client.contentprovider.ResultDetailContentProvider.StatusAware; -import org.argeo.slc.client.ui.ClientUiPlugin; import org.eclipse.jface.viewers.ITableLabelProvider; import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.swt.graphics.Image; @@ -47,12 +46,13 @@ public class ResultDetailLabelProvider extends LabelProvider implements public Image getImage(Object element) { if (element instanceof StatusAware) { - if (((StatusAware) element).isPassed()) - return ClientUiPlugin.getDefault().getImageRegistry() - .get("passedTest"); - else - return ClientUiPlugin.getDefault().getImageRegistry() - .get("failedTest"); + // FIXME: fin icons somewhere +// if (((StatusAware) element).isPassed()) +// return ClientUiPlugin.getDefault().getImageRegistry() +// .get("passedTest"); +// else +// return ClientUiPlugin.getDefault().getImageRegistry() +// .get("failedTest"); } return null; } diff --git a/eclipse/runtime/pom.xml b/eclipse/runtime/pom.xml index 915131f88..eed86db3b 100644 --- a/eclipse/runtime/pom.xml +++ b/eclipse/runtime/pom.xml @@ -11,7 +11,6 @@ SLC Eclipse Runtime pom - org.argeo.slc.client.commons org.argeo.slc.client.oxm org.argeo.slc.client.core diff --git a/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/JcrAgent.java b/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/JcrAgent.java new file mode 100644 index 000000000..b8e99cb3f --- /dev/null +++ b/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/JcrAgent.java @@ -0,0 +1,37 @@ +package org.argeo.slc.jcr; + +import java.util.List; + +import org.argeo.slc.execution.ExecutionModuleDescriptor; +import org.argeo.slc.process.SlcExecution; +import org.argeo.slc.runtime.SlcAgent; + +public class JcrAgent implements SlcAgent { + + public String getAgentUuid() { + // TODO Auto-generated method stub + return null; + } + + public ExecutionModuleDescriptor getExecutionModuleDescriptor( + String moduleName, String version) { + // TODO Auto-generated method stub + return null; + } + + public List listExecutionModuleDescriptors() { + // TODO Auto-generated method stub + return null; + } + + public void runSlcExecution(SlcExecution slcExecution) { + // TODO Auto-generated method stub + + } + + public boolean ping() { + // TODO Auto-generated method stub + return false; + } + +} diff --git a/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/SlcTypes.java b/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/SlcTypes.java new file mode 100644 index 000000000..81517c58f --- /dev/null +++ b/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/SlcTypes.java @@ -0,0 +1,6 @@ +package org.argeo.slc.jcr; + +public interface SlcTypes { + + public final static String SLC_AGENT = "slc:agent"; +} -- 2.39.2