-
Notifications
You must be signed in to change notification settings - Fork 8
/
EasySOA-0.5.patch
5894 lines (5804 loc) · 235 KB
/
EasySOA-0.5.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
diff --git a/easysoa-proxy/easysoa-proxy-core/easysoa-proxy-core-api-frascati/src/main/resources/runManager.composite b/easysoa-proxy/easysoa-proxy-core/easysoa-proxy-core-api-frascati/src/main/resources/runManager.composite
index 7eba598..b3e6183 100644
--- a/easysoa-proxy/easysoa-proxy-core/easysoa-proxy-core-api-frascati/src/main/resources/runManager.composite
+++ b/easysoa-proxy/easysoa-proxy-core/easysoa-proxy-core-api-frascati/src/main/resources/runManager.composite
@@ -24,6 +24,9 @@
<sca:reference name="compositeTemplates" target="TemplateProcessor/processor" />
</sca:component>
+ <sca:service name="runManagerService" promote="runManagerComponent/runManagerService">
+ <sca:interface.java interface="org.easysoa.run.RunManager" />
+ </sca:service>
<!-- Run Manager -->
<sca:component name="runManagerComponent">
<sca:service name="runManagerService">
diff --git a/easysoa-proxy/easysoa-proxy-core/easysoa-proxy-core-api-frascati/src/main/resources/scheduledValidationReplayEngine.composite b/easysoa-proxy/easysoa-proxy-core/easysoa-proxy-core-api-frascati/src/main/resources/scheduledValidationReplayEngine.composite
index c355c4c..88510a2 100644
--- a/easysoa-proxy/easysoa-proxy-core/easysoa-proxy-core-api-frascati/src/main/resources/scheduledValidationReplayEngine.composite
+++ b/easysoa-proxy/easysoa-proxy-core/easysoa-proxy-core-api-frascati/src/main/resources/scheduledValidationReplayEngine.composite
@@ -4,6 +4,12 @@
<!-- ReplayEngine service -->
<!--<sca:service name="scheduledValidationReplayEngineService" promote="scheduledValidationReplayEngineComponent/scheduledValidationReplayEngineService"/>-->
+
+ <sca:service name="scheduledValidationReplayEngineService"
+ promote="scheduledValidationReplayEngineComponent/scheduledValidationReplayEngineService">
+ <sca:interface.java interface="org.easysoa.validation.ExchangeReplayController" />
+ </sca:service>
+
<!-- Exchange replay service -->
<sca:component name="scheduledValidationReplayEngineComponent">
<sca:service name="scheduledValidationReplayEngineService">
diff --git a/easysoa-proxy/easysoa-proxy-core/easysoa-proxy-core-handlermanager/src/main/resources/handlerManager.composite b/easysoa-proxy/easysoa-proxy-core/easysoa-proxy-core-handlermanager/src/main/resources/handlerManager.composite
index f709b7d..2cc90c2 100644
--- a/easysoa-proxy/easysoa-proxy-core/easysoa-proxy-core-handlermanager/src/main/resources/handlerManager.composite
+++ b/easysoa-proxy/easysoa-proxy-core/easysoa-proxy-core-handlermanager/src/main/resources/handlerManager.composite
@@ -10,6 +10,13 @@
<sca:implementation.composite name="handlerManagerBase"/>
</sca:component>-->
+ <sca:service name="scheduledValidationReplayEngineService"
+ promote="handlerManagerServiceBaseComp/scheduledValidationReplayEngineService">
+ <sca:interface.java interface="org.easysoa.validation.ExchangeReplayController" />
+ </sca:service>
+ <sca:service name="runManagerService" promote="handlerManagerServiceBaseComp/runManagerService">
+ <sca:interface.java interface="org.easysoa.run.RunManager" />
+ </sca:service>
<!-- Handler manager -->
<sca:service name="handlerManager" promote="handlerManagerServiceBaseComp/handlerManagerComponentService">
<sca:interface.java interface="org.easysoa.exchangehandler.HandlerManager" />
@@ -18,6 +25,12 @@
<sca:service name="handlerManagerComponentService">
<sca:interface.java interface="org.easysoa.exchangehandler.HandlerManager" />
</sca:service>
+ <sca:service name="scheduledValidationReplayEngineService">
+ <sca:interface.java interface="org.easysoa.validation.ExchangeReplayController" />
+ </sca:service>
+ <sca:service name="runManagerService">
+ <sca:interface.java interface="org.easysoa.run.RunManager" />
+ </sca:service>
<sca:implementation.composite name="handlerManagerBase.composite"/>
</sca:component>
diff --git a/easysoa-proxy/easysoa-proxy-core/easysoa-proxy-core-httpdiscoveryproxy-test/src/test/java/org/easysoa/cxf/CxfProviderDispatcherTest.java b/easysoa-proxy/easysoa-proxy-core/easysoa-proxy-core-httpdiscoveryproxy-test/src/test/java/org/easysoa/cxf/CxfProviderDispatcherTest.java
index e1d4eaf..c9e6dfc 100644
--- a/easysoa-proxy/easysoa-proxy-core/easysoa-proxy-core-httpdiscoveryproxy-test/src/test/java/org/easysoa/cxf/CxfProviderDispatcherTest.java
+++ b/easysoa-proxy/easysoa-proxy-core/easysoa-proxy-core-httpdiscoveryproxy-test/src/test/java/org/easysoa/cxf/CxfProviderDispatcherTest.java
@@ -26,7 +26,7 @@
import javax.xml.ws.Endpoint;
import org.apache.log4j.Logger;
-import org.easysoa.frascati.FraSCAtiServiceException;
+import org.ow2.frascati.nuxeo.exception.FraSCAtiInNuxeoServiceException;
import org.easysoa.test.util.AbstractProxyTestStarter;
import org.junit.After;
import org.junit.Before;
@@ -86,10 +86,10 @@
/**
* Test inside Frascati
* @throws FrascatiException, IOException, SOAPException If a problem occurs
- * @throws FraSCAtiServiceException
+ * @throws FraSCAtiInNuxeoServiceException
*/
@Test
- public void cxfProviderTestInFraSCAti() throws IOException, SOAPException, FraSCAtiServiceException{
+ public void cxfProviderTestInFraSCAti() throws IOException, SOAPException, FraSCAtiInNuxeoServiceException{
// Start the CXF Meteo mock provider in FraSCAti
// PB with FraSCAti : the port name and the service are the interface name (+ prefix or suffix)
// JAX-WS annotations are not used in FraSCAti
@@ -103,9 +103,9 @@
/**
* Start the CXF Meteo Mock provider
* @throws FrascatiException If a problem occurs
- * @throws FraSCAtiServiceException
+ * @throws FraSCAtiInNuxeoServiceException
*/
- private void startCxfMeteoMockProvider() throws FraSCAtiServiceException {
+ private void startCxfMeteoMockProvider() throws FraSCAtiInNuxeoServiceException {
logger.info("Services Mock Starting");
this.componentList.add(this.frascati.processComposite("cxfMeteoMockProvider.composite"));
//this.componentList.add(this.frascati.processComposite("src/test/resources/cxfMeteoMockProvider.composite"));
diff --git a/easysoa-proxy/easysoa-proxy-core/easysoa-proxy-core-httpdiscoveryproxy-test/src/test/java/org/easysoa/proxy/handler/event/EventExchangeHandlerTest.java b/easysoa-proxy/easysoa-proxy-core/easysoa-proxy-core-httpdiscoveryproxy-test/src/test/java/org/easysoa/proxy/handler/event/EventExchangeHandlerTest.java
index a848423..c88b259 100644
--- a/easysoa-proxy/easysoa-proxy-core/easysoa-proxy-core-httpdiscoveryproxy-test/src/test/java/org/easysoa/proxy/handler/event/EventExchangeHandlerTest.java
+++ b/easysoa-proxy/easysoa-proxy-core/easysoa-proxy-core-httpdiscoveryproxy-test/src/test/java/org/easysoa/proxy/handler/event/EventExchangeHandlerTest.java
@@ -37,7 +37,7 @@
import org.apache.http.impl.client.DefaultHttpClient;
import org.apache.log4j.Logger;
import org.easysoa.EasySOAConstants;
-import org.easysoa.frascati.FraSCAtiServiceException;
+import org.ow2.frascati.nuxeo.exception.FraSCAtiInNuxeoServiceException;
import org.easysoa.proxy.handler.event.admin.CompiledCondition;
import org.easysoa.proxy.handler.event.admin.IEventMessageHandler;
import org.easysoa.proxy.handler.event.admin.RegexCondition;
@@ -80,7 +80,7 @@
}
@Test
- public void testEmpty() throws ClientProtocolException, IOException, FraSCAtiServiceException {
+ public void testEmpty() throws ClientProtocolException, IOException, FraSCAtiInNuxeoServiceException {
// using empty event map
String urlToListen = "http://localhost:8080/";
// call a service to listen
@@ -93,7 +93,7 @@
}
@Test
- public void udpateSubscriptionsTest() throws FraSCAtiServiceException, ClientProtocolException, IOException {
+ public void udpateSubscriptionsTest() throws FraSCAtiInNuxeoServiceException, ClientProtocolException, IOException {
//EventMessageHandler eventMessageHandler = new EventMessageHandler();
// eventMessageHandler.updateSubscription(subscription, subscriptionId)
@@ -147,7 +147,7 @@
}
@Test
- public void testWithSome() throws ClientProtocolException, IOException, FraSCAtiServiceException, InterruptedException {
+ public void testWithSome() throws ClientProtocolException, IOException, FraSCAtiInNuxeoServiceException, InterruptedException {
String urlToListen = "http://localhost:8080/another";
// set some conf
diff --git a/easysoa-proxy/easysoa-proxy-core/easysoa-proxy-core-httpdiscoveryproxy-test/src/test/java/org/easysoa/test/util/AbstractProxyTestStarter.java b/easysoa-proxy/easysoa-proxy-core/easysoa-proxy-core-httpdiscoveryproxy-test/src/test/java/org/easysoa/test/util/AbstractProxyTestStarter.java
index da191b0..6f16ad9 100644
--- a/easysoa-proxy/easysoa-proxy-core/easysoa-proxy-core-httpdiscoveryproxy-test/src/test/java/org/easysoa/test/util/AbstractProxyTestStarter.java
+++ b/easysoa-proxy/easysoa-proxy-core/easysoa-proxy-core-httpdiscoveryproxy-test/src/test/java/org/easysoa/test/util/AbstractProxyTestStarter.java
@@ -34,7 +34,7 @@
import org.apache.http.impl.client.DefaultHttpClient;
import org.apache.log4j.Logger;
import org.easysoa.EasySOAConstants;
-import org.easysoa.frascati.FraSCAtiServiceException;
+import org.ow2.frascati.nuxeo.exception.FraSCAtiInNuxeoServiceException;
import org.easysoa.frascati.api.FraSCAtiServiceItf;
import org.easysoa.sca.frascati.RemoteFraSCAtiServiceProvider;
import org.easysoa.sca.frascati.test.RemoteFraSCAtiServiceProviderTest;
@@ -103,7 +103,7 @@
logger.info("FraSCATI Starting");
componentList = new ArrayList<Composite>();
serviceProvider = new RemoteFraSCAtiServiceProvider(null);
- frascati = serviceProvider.getFraSCAtiService();
+ frascati = serviceProvider.getFraSCAtiInNuxeoService();
}
}
@@ -163,7 +163,7 @@
* Start HTTP Proxy
*
* @throws FrascatiException
- * @throws FraSCAtiServiceException
+ * @throws FraSCAtiInNuxeoServiceException
*/
protected void startHttpDiscoveryProxy(String composite, URL... urls) throws Exception {
logger.info("HTTP Discovery Proxy Starting");
@@ -179,7 +179,7 @@
* If true, the Nuxeo mock is started
* @throws FrascatiException
* if a problem occurs during the start of composites
- * @throws FraSCAtiServiceException
+ * @throws FraSCAtiInNuxeoServiceException
*/
protected void startMockServices(boolean withNuxeoMock, boolean withTwitterMock, boolean withMeteoMock) throws Exception {
logger.info("Services Mock Starting");
diff --git a/easysoa-registry/easysoa-frascati-service-api/pom.xml b/easysoa-registry/easysoa-frascati-service-api/pom.xml
index 2ef79e4..bf81282 100644
--- a/easysoa-registry/easysoa-frascati-service-api/pom.xml
+++ b/easysoa-registry/easysoa-frascati-service-api/pom.xml
@@ -29,6 +29,23 @@
<dependencies>
<dependency>
+ <groupId>org.ow2.frascati.nuxeo</groupId>
+ <artifactId>frascati-nuxeo-service-api</artifactId>
+ <version>${frascati.version}</version>
+ </dependency>
+ <!-- <dependency>
+ <groupId>org.ow2.frascati.nuxeo</groupId>
+ <artifactId>frascati-isolated</artifactId>
+ <version>${frascati.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.runtime</groupId>
+ <artifactId>nuxeo-runtime-bridge</artifactId>
+ <version>5.5-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency> -->
+ <dependency>
<groupId>org.ow2.frascati.model</groupId>
<artifactId>frascati-model</artifactId>
<version>2.0.1.3</version>
diff --git a/easysoa-registry/easysoa-frascati-service-api/src/main/java/org/easysoa/frascati/FraSCAtiServiceException.java b/easysoa-registry/easysoa-frascati-service-api/src/main/java/org/easysoa/frascati/FraSCAtiServiceException.java
deleted file mode 100644
index 857ebe3..0000000
--- a/easysoa-registry/easysoa-frascati-service-api/src/main/java/org/easysoa/frascati/FraSCAtiServiceException.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
- * EasySOA - FraSCAti
- * Copyright 2011 Open Wide
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Contact : [email protected]
- */
-package org.easysoa.frascati;
-
-/**
- *
- * An exception thrown by a FraSCAtiServiceItf implementation instance
- * Use to wrap FrascatiException which is not visible outside of the FraSCAti
- * context
- */
-public class FraSCAtiServiceException extends Exception
-{
- /**
- * Generated serial ID
- */
- private static final long serialVersionUID = 4118928600670547821L;
-
- /**
- * Constructor
- */
- public FraSCAtiServiceException()
- {
- super();
- }
- /**
- * Constructor with a message
- */
- public FraSCAtiServiceException(String message)
- {
- super(message);
- }
-}
diff --git a/easysoa-registry/easysoa-frascati-service-api/src/main/java/org/easysoa/frascati/api/FraSCAtiServiceItf.java b/easysoa-registry/easysoa-frascati-service-api/src/main/java/org/easysoa/frascati/api/FraSCAtiServiceItf.java
index 3e3726b..e973811 100644
--- a/easysoa-registry/easysoa-frascati-service-api/src/main/java/org/easysoa/frascati/api/FraSCAtiServiceItf.java
+++ b/easysoa-registry/easysoa-frascati-service-api/src/main/java/org/easysoa/frascati/api/FraSCAtiServiceItf.java
@@ -22,14 +22,14 @@
import java.net.URL;
import java.util.List;
-import org.easysoa.frascati.FraSCAtiServiceException;
+import org.ow2.frascati.nuxeo.api.FraSCAtiInNuxeoServiceItf;
+import org.ow2.frascati.nuxeo.exception.FraSCAtiInNuxeoServiceException;
import org.eclipse.stp.sca.Composite;
import org.osoa.sca.annotations.Service;
@Service
-public interface FraSCAtiServiceItf
+public interface FraSCAtiServiceItf extends FraSCAtiInNuxeoServiceItf
{
-
//Define FraSCAti's ProcessingModes as integers
public static final int parse = 0;
public static final int check = 1;
@@ -39,6 +39,16 @@
public static final int complete = 5;
public static final int start = 6;
public static final int all = 7;
+
+ /**
+ * The name of component providing the service.
+ */
+ public static final String FRASCATI_IN_NUXEO_SERVICE_COMPONENT_NAME = "easysoa";
+
+ /**
+ * The name of service implementing the FraSCAtiInNuxeoServiceItf interface
+ */
+ public static final String FRASCATI_IN_NUXEO_SERVICE_SERVICE_NAME = "frascati-service";
/**
* Return the Composite which name is passed on as a parameter
@@ -46,11 +56,11 @@
* @param compositeName
* the name of the composite
* @return the composite
- * @throws FraSCAtiServiceException
+ * @throws FraSCAtiInNuxeoServiceException
* if the composite doesn't exist
*/
Composite getComposite(String compositeName)
- throws FraSCAtiServiceException;
+ throws FraSCAtiInNuxeoServiceException;
/**
* Process a contribution ZIP archive.
@@ -63,24 +73,11 @@
* @param urls
* a set of URLs to build the FraSCAti ProcessingContext
* @return an array of loaded components' name.
- * @throws FraSCAtiServiceException
+ * @throws FraSCAtiInNuxeoServiceException
* if no component can be found in the contribution file
*/
String[] processContribution(String contribution, int processingMode,
- URL... urls) throws FraSCAtiServiceException;
-
- /**
- * Process a contribution ZIP archive, using the ProcessingMode.all mode
- *
- * @param contribution
- * name of the contribution file to load.
- * @return an array of FraSCAtiCompositeItf embedded loaded composites.
- * @throws FraSCAtiServiceException
- * if no component can be found in the contribution file
- */
- String[] processContribution(String contribution)
- throws FraSCAtiServiceException;
-
+ URL... urls) throws FraSCAtiInNuxeoServiceException;
/**
* Loads an SCA composite and create the associate FraSCAti composite
* instance.
@@ -94,11 +91,11 @@
* a set of URLs to build the FraSCAti ProcessingContext
* @return the FraSCAtiCompositeItf embedded resulting FraSCAti composite
* instance.
- * @throws FraSCAtiServiceException
+ * @throws FraSCAtiInNuxeoServiceException
* if the composite can not be loaded
*/
Composite processComposite(String composite, int processingMode, URL... urls)
- throws FraSCAtiServiceException;
+ throws FraSCAtiInNuxeoServiceException;
/**
* Load an SCA composite which path is passed on as a parameter
@@ -106,69 +103,11 @@
* @param composite
* name of the composite file to load
* @return the name of the loaded component.
- * @throws FraSCAtiServiceException
+ * @throws FraSCAtiInNuxeoServiceException
* if the component cannot be loaded
*/
- Composite processComposite(String composite) throws FraSCAtiServiceException;
-
- /**
- * Return the state of the component which name is passed on as a
- * parameter
- *
- * @param componentName
- * the name of the component to start
- * @return
- * "STARTED" if the component is started
- * "STOPPED" if the component is stopped
- */
- String state(String compositeName);
+ Composite processComposite(String composite) throws FraSCAtiInNuxeoServiceException;
- /**
- * Start the component which name is passed on as parameter
- *
- * @param componentName
- * the name of the component to start
- */
- void start(String compositeName);
-
- /**
- * Stop the component which name is passed on as parameter
- *
- * @param componentName
- * the name of the component to stop
- */
- void stop(String compositeName);
-
- /**
- * Remove from FraSCAti the component which name is passed on as parameter
- *
- * @param componentName
- * the name of the component to remove
- * @throws FraSCAtiServiceException
- * if the component doesn't exist
- */
- void remove(String compositeName)
- throws FraSCAtiServiceException;
-
- /**
- * Return the service associated to the component which name is passed on as
- * parameter, with the name and class type also passed on as parameter
- *
- * @param compositeName
- * the name of the composite to look the service in
- * @param serviceName
- * the service name
- * @param serviceClass
- * the service class
- * @return the service instance
- * @throws FraSCAtiServiceException
- * if the service has not been found
- */
- <T> T getService(String compositeName,
- String serviceName, Class<T> serviceClass)
- throws FraSCAtiServiceException;
-
-
/**
* Return the number of errors which occurred during
* the processing process
diff --git a/easysoa-registry/easysoa-frascati-service-api/src/main/java/org/easysoa/frascati/api/FraSCAtiServiceProviderItf.java b/easysoa-registry/easysoa-frascati-service-api/src/main/java/org/easysoa/frascati/api/FraSCAtiServiceProviderItf.java
deleted file mode 100644
index e457345..0000000
--- a/easysoa-registry/easysoa-frascati-service-api/src/main/java/org/easysoa/frascati/api/FraSCAtiServiceProviderItf.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- * EasySOA - FraSCAti
- * Copyright 2011 Open Wide
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Contact : [email protected]
- */
-package org.easysoa.frascati.api;
-
-import org.easysoa.frascati.api.FraSCAtiServiceItf;
-
-/**
- * Provide an access to a FraSCAtiServiceItf implementation instance
- */
-public interface FraSCAtiServiceProviderItf
-{
- /**
- * Return a FraSCAtiServiceItf implementation instance
- */
- FraSCAtiServiceItf getFraSCAtiService();
-
-}
diff --git a/easysoa-registry/easysoa-frascati-service/pom.xml b/easysoa-registry/easysoa-frascati-service/pom.xml
index c56b10c..a0b0924 100644
--- a/easysoa-registry/easysoa-frascati-service/pom.xml
+++ b/easysoa-registry/easysoa-frascati-service/pom.xml
@@ -28,6 +28,24 @@
<dependencies>
<dependency>
+ <groupId>org.ow2.frascati.nuxeo</groupId>
+ <artifactId>frascati-nuxeo-service</artifactId>
+ <version>${frascati.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.frascati.nuxeo</groupId>
+ <artifactId>frascati-nuxeo-service-api</artifactId>
+ <version>${frascati.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.frascati.nuxeo</groupId>
+ <artifactId>frascati-event-parser</artifactId>
+ <version>${frascati.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.easysoa.frascati</groupId>
<artifactId>easysoa-frascati-service-api</artifactId>
<version>0.5-SNAPSHOT</version>
@@ -94,7 +112,13 @@
<artifactId>xercesImpl</artifactId>
<version>2.9.1</version>
<scope>compile</scope>
- </dependency>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.frascati.nuxeo</groupId>
+ <artifactId>frascati-event-parser</artifactId>
+ <version>${frascati.version}</version>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
</plugin>
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
@@ -143,7 +167,7 @@
<groupId>org.ow2.frascati.mojo</groupId>
<artifactId>frascati-compiler-plugin</artifactId>
<configuration>
- <composite>org/ow2/frascati/assembly/factory/AssemblyFactory</composite>
+ <composite>org/ow2/frascati/FraSCAti</composite>
</configuration>
</plugin>
</plugins>
diff --git a/easysoa-registry/easysoa-frascati-service/src/main/java/org/easysoa/frascati/FraSCAtiService.java b/easysoa-registry/easysoa-frascati-service/src/main/java/org/easysoa/frascati/FraSCAtiService.java
index 37f6e4c..dc80b7d 100644
--- a/easysoa-registry/easysoa-frascati-service/src/main/java/org/easysoa/frascati/FraSCAtiService.java
+++ b/easysoa-registry/easysoa-frascati-service/src/main/java/org/easysoa/frascati/FraSCAtiService.java
@@ -20,40 +20,21 @@
package org.easysoa.frascati;
import java.net.URL;
-//import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.xml.namespace.QName;
import org.easysoa.frascati.api.FraSCAtiServiceItf;
-//import org.easysoa.frascati.api.RegistryItf;
import org.easysoa.frascati.api.ScaImporterIntermediaryItf;
import org.easysoa.frascati.api.ScaImporterRecipientItf;
-//import org.easysoa.frascati.api.intent.ComponentIntentObserverItf;
-import org.easysoa.frascati.api.intent.ParserIntentObserverItf;
-//import org.easysoa.frascati.api.intent.ProcessingIntentObserverItf;
-import org.easysoa.frascati.processor.EasySOAProcessingContext;
import org.eclipse.stp.sca.Composite;
-import org.objectweb.fractal.api.Component;
-import org.objectweb.fractal.api.NoSuchInterfaceException;
-import org.objectweb.fractal.api.control.ContentController;
-import org.objectweb.fractal.api.control.IllegalLifeCycleException;
-import org.objectweb.fractal.api.control.LifeCycleController;
-import org.objectweb.fractal.api.control.NameController;
import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
import org.osoa.sca.annotations.Service;
-import org.ow2.frascati.assembly.factory.api.ClassLoaderManager;
-import org.ow2.frascati.assembly.factory.api.CompositeManager;
-import org.ow2.frascati.assembly.factory.api.ManagerException;
import org.ow2.frascati.assembly.factory.api.ProcessingMode;
-import org.ow2.frascati.util.AbstractLoggeable;
+import org.ow2.frascati.nuxeo.base.api.AbstractFraSCAtiInNuxeoService;
+import org.ow2.frascati.nuxeo.exception.FraSCAtiInNuxeoServiceException;
import org.ow2.frascati.util.FrascatiClassLoader;
-import org.ow2.frascati.util.io.IOUtils;
/**
* Implementation of the {@link FraSCAtiServiceItf}
@@ -61,31 +42,17 @@
* @author Christophe Munilla
*
*/
-@Scope("COMPOSITE")
-@Service(interfaces = { FraSCAtiServiceItf.class, ParserIntentObserverItf.class })
-public class FraSCAtiService
-extends AbstractLoggeable implements FraSCAtiServiceItf, ParserIntentObserverItf
+@Service(interfaces = { FraSCAtiServiceItf.class })
+public class FraSCAtiService extends AbstractFraSCAtiInNuxeoService<EasySOAProcessingContext>
+implements FraSCAtiServiceItf
{
-// @Reference(name = "registry")
-// private RegistryItf registry;
-
- @Reference(name = "composite-manager")
- private CompositeManager compositeManager;
-
- /**
- * The required CompositeManager
- */
- @Reference(name = "classloader-manager")
- private ClassLoaderManager classLoaderManager;
-
@Reference(name = "runtime-sca-importer")
private ScaImporterIntermediaryItf runtimeSCAImporter;
-
- private static Logger logger = Logger.getLogger(FraSCAtiService.class.getCanonicalName());
+
+ private Map<String,Composite> compositeMap;
private List<String> warningMessages;
private List<String> errorMessages;
- private Map<String,Composite> compositesMap;
private int errors;
private int warnings;
@@ -93,42 +60,26 @@
/**
* {@inheritDoc}
*
- * @see org.easysoa.frascati.api.FraSCAtiServiceItf#getComposite(java.lang.String)
+ * @see org.ow2.frascati.nuxeo.base.api.AbstractFraSCAtiInNuxeoService#
+ * newProcessingContext(java.lang.ClassLoader)
*/
- public Composite getComposite(String compositeName)
- throws FraSCAtiServiceException
+ @Override
+ protected EasySOAProcessingContext newProcessingContext(ClassLoader classloader)
{
- Component component = null;
- String componentName = IOUtils.pathLastPart(compositeName);
- try
- {
- component = getComponent(
- compositeManager.getTopLevelDomainComposite(),componentName);
-
- } catch (Exception e)
- {
- logger.log(Level.SEVERE,e.getMessage(),e);
- }
- if(component != null )
- {
- return compositesMap.get(compositeName);
- }
- return null;
- }
-
+ return newProcessingContext(classloader,FraSCAtiServiceItf.all);
+ }
+
/**
- * {@inheritDoc}
- *
- * @see org.easysoa.frascati.api.FraSCAtiServiceItf#processContribution(java.
- * lang.String, int, java.net.URL[])
+ * @param classloader
+ * @param processingMode
+ * @return
*/
- public String[] processContribution(String contribution,
- int processingMode, URL... urls) throws FraSCAtiServiceException
+ protected EasySOAProcessingContext newProcessingContext(ClassLoader classloader,
+ int processingMode, URL...urls)
{
- EasySOAProcessingContext processingContext =
- new EasySOAProcessingContext(classLoaderManager.getClassLoader());
-
- FrascatiClassLoader fcl = (FrascatiClassLoader)processingContext.getClassLoader();
+ EasySOAProcessingContext context = new EasySOAProcessingContext(classloader);
+ context.setProcessingMode(resovleProcessingMode(processingMode));
+ FrascatiClassLoader fcl = (FrascatiClassLoader)context.getClassLoader();
if(urls != null)
{
for(URL url : urls)
@@ -136,70 +87,67 @@
fcl.addUrl(url);
}
}
- processingContext.setProcessingMode(resovleProcessingMode(processingMode));
-
- ClassLoader current = Thread.currentThread().getContextClassLoader();
- Thread.currentThread().setContextClassLoader(fcl);
-
- Component[] components;
+ return context;
+ }
+
+ /**
+ * Constructor
+ */
+ public FraSCAtiService()
+ {
+ super();
+ compositeMap = new HashMap<String,Composite>();
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.easysoa.frascati.api.FraSCAtiServiceItf#processContribution(java.
+ * lang.String, int, java.net.URL[])
+ */
+ public String[] processContribution(String contribution,
+ int processingMode, URL... urls) throws FraSCAtiInNuxeoServiceException
+ {
+ EasySOAProcessingContext processingContext = newProcessingContext(
+ classLoaderManager.getClassLoader(),processingMode,urls);
try
{
- components = compositeManager.processContribution(contribution,
- processingContext);
-
- } catch (ManagerException e)
- {
- logger.log(Level.SEVERE,e.getMessage(),e);
- throw new FraSCAtiServiceException("Enable to process the '"
- + contribution + "' contribution");
+ String[] componentNames = super.processContribution(
+ contribution, processingContext);
- }catch(Exception e)
+ return componentNames;
+
+ } catch (FraSCAtiInNuxeoServiceException e)
{
- logger.log(Level.SEVERE,e.getMessage(),e);
- throw new FraSCAtiServiceException("Enable to process the '"
- + contribution + "' composite");
+ throw e;
+
} finally
{
- Thread.currentThread().setContextClassLoader(current);
this.warningMessages = processingContext.getWarningMessages();
this.errorMessages = processingContext.getErrorMessages();
this.errors = processingContext.getErrors();
this.warnings = processingContext.getWarnings();
- }
- if(components != null && components.length>0)
- {
- String[] processed = new String[components.length];
- int currentComponentIndex = 0;
- for(;currentComponentIndex<components.length;currentComponentIndex++)
- {
- try{
- processed[currentComponentIndex] = ((NameController)components[
- currentComponentIndex].getFcInterface(
- "name-controller")).getFcName();
-
- } catch(NoSuchInterfaceException e)
- {
- log.log(Level.WARNING,e.getMessage());
- }
- }
- return processed;
-
- } else
- {
- return new String[0];
}
}
/**
* {@inheritDoc}
*
- * @see org.easysoa.frascati.api.FraSCAtiServiceItf#processContribution(java.
- * lang.String)
+ * @see org.ow2.frascati.nuxeo.base.api.AbstractFraSCAtiInNuxeoService#
+ * processContribution(java.lang.String)
*/
+ @Override
public String[] processContribution(String contribution)
- throws FraSCAtiServiceException
{
- return processContribution(contribution, FraSCAtiServiceItf.all);
+ try
+ {
+ return processContribution(contribution, FraSCAtiServiceItf.all);
+
+ } catch (FraSCAtiInNuxeoServiceException e)
+ {
+ log.log(Level.WARNING,e.getMessage(),e);
+ }
+ return null;
}
/**
@@ -209,29 +157,25 @@
* .String, int, java.net.URL[])
*/
public Composite processComposite(String composite, int processingMode,
- URL... urls) throws FraSCAtiServiceException
+ URL... urls) throws FraSCAtiInNuxeoServiceException
{
FrascatiClassLoader classLoader = new FrascatiClassLoader(
urls!=null?urls:new URL[0] , classLoaderManager.getClassLoader());
- EasySOAProcessingContext processingContext = new EasySOAProcessingContext(
- classLoader);
- processingContext.setProcessingMode(resovleProcessingMode(processingMode));
- Component component = null;
+ EasySOAProcessingContext processingContext = newProcessingContext(
+ classLoader, processingMode);
+
+ Composite rootComposite = null;
try
- {
- component = compositeManager.processComposite(new QName(composite),
- processingContext);
-
- } catch (ManagerException e)
{
- logger.log(Level.SEVERE,e.getMessage(),e);
- throw new FraSCAtiServiceException("Enable to process the '"
- + composite + "' composite");
- } catch(Exception e)
+ String componentName = super.processComposite(composite, processingContext);
+ rootComposite = processingContext.getRootComposite();
+ if(rootComposite != null)
+ {
+ compositeMap.put(componentName, rootComposite);
+ }
+ } catch (FraSCAtiInNuxeoServiceException e)
{
- logger.log(Level.SEVERE,e.getMessage(),e);
- throw new FraSCAtiServiceException("Enable to process the '"
- + composite + "' composite");
+ throw e;
}
finally
{
@@ -240,21 +184,7 @@
this.errors = processingContext.getErrors();
this.warnings = processingContext.getWarnings();
}
- if(component != null)
- {
- try{
-
- return getComposite(((NameController)component.getFcInterface(
- "name-controller")).getFcName());
-
- } catch(NoSuchInterfaceException e)
- {
- log.log(Level.WARNING,e.getMessage());
- }
- } else if (processingContext.getRootComposite() != null) {
- return processingContext.getRootComposite();
- }
- return null;
+ return processingContext.getRootComposite();
}
/**
@@ -264,185 +194,33 @@
* .String)
*/
public Composite processComposite(String composite)
- throws FraSCAtiServiceException
+ throws FraSCAtiInNuxeoServiceException
{
return processComposite(composite, FraSCAtiServiceItf.all);
}
/**
* {@inheritDoc}
- *
- * @see org.easysoa.frascati.api.FraSCAtiServiceItf#state(java.lang.String)
+ *
+ * @see org.easysoa.frascati.api.FraSCAtiServiceItf#getComposite(java.lang.String)
*/
- public String state(String compositeName)
+ public Composite getComposite(String compositeName)
+ throws FraSCAtiInNuxeoServiceException
{
- Component component = null;
- try
- {
- component = getComponent(
- compositeManager.getTopLevelDomainComposite(),compositeName);
-
- } catch (Exception e)
- {
- logger.log(Level.SEVERE,e.getMessage(),e);
- }
- if (component != null)
- {
- try
- {
- LifeCycleController lcController = (LifeCycleController) component
- .getFcInterface("lifecycle-controller");
-
- return lcController.getFcState();
-
- } catch (NoSuchInterfaceException e)
- {
- log.log(Level.WARNING,e.getMessage(),e);
- }
- }
- return null;
+ return compositeMap.get(compositeName);
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.easysoa.frascati.api.FraSCAtiServiceItf#
+ * setScaImporterRecipient(org.easysoa.frascati.api.ScaImporterRecipientItf)
+ */
+ public void setScaImporterRecipient(ScaImporterRecipientItf recipient)
+ {
+ this.runtimeSCAImporter.setScaImporterRecipient(recipient);
}
- /**
- * {@inheritDoc}
- *
- * @see org.easysoa.frascati.api.FraSCAtiServiceItf#start(java.lang.String)
- */
- public void start(String componentName)
- {
- Component component = null;
- try
- {
- component = getComponent(
- compositeManager.getTopLevelDomainComposite(),componentName);
-
- } catch (Exception e)
- {
- logger.log(Level.SEVERE,e.getMessage(),e);
- }
- if (component != null)
- {
- try
- {
- LifeCycleController lcController = (LifeCycleController) component
- .getFcInterface("lifecycle-controller");
- if (!LifeCycleController.STARTED.equals(lcController
- .getFcState()))
- {
- lcController.startFc();
- }
- } catch (NoSuchInterfaceException e)
- {
- logger.log(Level.SEVERE,e.getMessage(),e);
-
- } catch (IllegalLifeCycleException e)
- {
- logger.log(Level.SEVERE,e.getMessage(),e);
- }
- }
- }
-
- /**
- * {@inheritDoc}
- *
- * @see org.easysoa.frascati.api.FraSCAtiServiceItf#stop(java.lang.String)
- */
- public void stop(String componentName)
- {
- Component component = null;
- try
- {
- component = getComponent(
- compositeManager.getTopLevelDomainComposite(),componentName);
-
- } catch (Exception e)
- {
- logger.log(Level.SEVERE,e.getMessage(),e);
- }
- if (component != null)
- {
- try
- {
- LifeCycleController lcController = (LifeCycleController) component
- .getFcInterface("lifecycle-controller");
- if (!LifeCycleController.STOPPED.equals(lcController
- .getFcState()))
- {
- lcController.stopFc();
- }
- } catch (NoSuchInterfaceException e)
- {
- logger.log(Level.SEVERE,e.getMessage(),e);
-
- } catch (IllegalLifeCycleException e)
- {
- logger.log(Level.SEVERE,e.getMessage(),e);
- }
- }
-
- }
-
- /**
- * {@inheritDoc}
- *
- * @see org.easysoa.frascati.api.FraSCAtiServiceItf#remove(java.lang.String)
- */
- public void remove(String compositeName)
- throws FraSCAtiServiceException
- {
- String componentName = IOUtils.pathLastPart(compositeName);
- stop(componentName);
- try
- {
- compositeManager.removeComposite(componentName);
-
- } catch (ManagerException e)
- {
- logger.log(Level.SEVERE,e.getMessage(),e);
- throw new FraSCAtiServiceException("Enable to remove the '"