Wikitty-commits
Threads by month
- ----- 2026 -----
- June
- May
- April
- March
- February
- January
- ----- 2025 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
August 2010
- 7 participants
- 66 discussions
r270 - branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator
by bleny＠users.nuiton.org 18 Aug '10
by bleny＠users.nuiton.org 18 Aug '10
18 Aug '10
Author: bleny
Date: 2010-08-18 17:56:12 +0200 (Wed, 18 Aug 2010)
New Revision: 270
Url: http://nuiton.org/repositories/revision/wikitty/270
Log:
do not generate from classes that are not stereotyped as business entities
Modified:
branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java
branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyContractGenerator.java
branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java
branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyImplementationGenerator.java
Modified: branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java
===================================================================
--- branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java 2010-08-18 15:40:40 UTC (rev 269)
+++ branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java 2010-08-18 15:56:12 UTC (rev 270)
@@ -40,25 +40,36 @@
@Override
public void transformFromModel(ObjectModel model) {
- for (ObjectModelClass businessEntity : model.getClasses()) {
+
+ List<ObjectModelClass> modelBusinessEntities = new ArrayList<ObjectModelClass>();
+
+ // fill modelBusinessEntities with entities found in model
+ for (ObjectModelClass clazz : model.getClasses()) {
+ if (WikittyTransformerUtil.isBusinessEntity(clazz)) {
+ modelBusinessEntities.add(clazz);
+ }
+ }
+
+
+ for (ObjectModelClass businessEntity : modelBusinessEntities) {
ObjectModelClass abstractClass = createAbstractClass(businessEntity.getName() + "Abstract", businessEntity.getPackageName());
processedClasses.put(businessEntity, abstractClass);
setSuperClass(abstractClass, "BusinessEntityWikitty");
addInterface(abstractClass, businessEntity.getQualifiedName());
}
- for (ObjectModelClass businessEntity : model.getClasses()) {
+ for (ObjectModelClass businessEntity : modelBusinessEntities) {
addOperations(businessEntity, processedClasses.get(businessEntity));
}
// at this time, all operations in generated abstracts are just the operations
// like get/set etc. we will copy all operations of a given class to all children
// that's why constructors and others operations are not yet added
- for (ObjectModelClass businessEntity : model.getClasses()) {
+ for (ObjectModelClass businessEntity : modelBusinessEntities) {
addInheritedOperations(businessEntity, processedClasses.get(businessEntity));
}
- for (ObjectModelClass businessEntity : model.getClasses()) {
+ for (ObjectModelClass businessEntity : modelBusinessEntities) {
ObjectModelClass abstractClassForThisEntity = processedClasses.get(businessEntity);
addImports(abstractClassForThisEntity);
addConstructors(abstractClassForThisEntity);
Modified: branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyContractGenerator.java
===================================================================
--- branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyContractGenerator.java 2010-08-18 15:40:40 UTC (rev 269)
+++ branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyContractGenerator.java 2010-08-18 15:56:12 UTC (rev 270)
@@ -46,16 +46,18 @@
log.info(model.getClasses().size() + " classes to process");
for (ObjectModelClass clazz : model.getClasses()) {
- processClass(clazz);
+ if (WikittyTransformerUtil.isBusinessEntity(clazz)) {
+ processEntity(clazz);
+ }
}
processedClasses.clear();
}
- protected void processClass(ObjectModelClass clazz) {
- log.info("will process " + clazz.getPackageName() + ".." + clazz.getName());
- ObjectModelInterface contract = createInterface(clazz.getName(), clazz.getPackageName());
+ protected void processEntity(ObjectModelClass businessEntity) {
+ log.info("will process " + businessEntity.getPackageName() + ".." + businessEntity.getName());
+ ObjectModelInterface contract = createInterface(businessEntity.getName(), businessEntity.getPackageName());
addInterface(contract, WikittyTransformerUtil.BUSINESS_ENTITY_CLASS_FQN);
// TODO 20100811 bleny remove unused imports
@@ -78,18 +80,18 @@
addImport(contract, java.util.Date.class);
addImport(contract, java.util.LinkedHashSet.class);
- setDocumentation(contract, clazz.getDocumentation());
+ setDocumentation(contract, businessEntity.getDocumentation());
// adding public static final String EXT_CLIENT = "Client";
addConstant(contract,
- "EXT_" + clazz.getName().toUpperCase(),
+ "EXT_" + businessEntity.getName().toUpperCase(),
"String",
- "\"" + clazz.getName() + "\"",
+ "\"" + businessEntity.getName() + "\"",
ObjectModelModifier.PUBLIC);
- String extensionVariableName = WikittyTransformerUtil.classToExtensionVariableName(clazz, false);
+ String extensionVariableName = WikittyTransformerUtil.classToExtensionVariableName(businessEntity, false);
- for(ObjectModelAttribute attribute : clazz.getAttributes()) {
+ for(ObjectModelAttribute attribute : businessEntity.getAttributes()) {
if (attribute.isNavigable()) {
// two variables needed below
String fieldVariableName = WikittyTransformerUtil.attributeToFielVariableName(attribute, false);
@@ -109,7 +111,7 @@
}
}
- for (ObjectModelAttribute attribute : clazz.getAttributes()) {
+ for (ObjectModelAttribute attribute : businessEntity.getAttributes()) {
if (attribute.isNavigable()) {
// needed below, in templates
String fieldVariableName = WikittyTransformerUtil.attributeToFielVariableName(attribute, true);
@@ -161,13 +163,13 @@
// now, add to this contract all operation due to inheritence from
// other business entities
- Collection<ObjectModelClass> superClasses = clazz.getSuperclasses();
+ Collection<ObjectModelClass> superClasses = businessEntity.getSuperclasses();
for (ObjectModelClass superClass : superClasses) {
addInterface(contract, superClass.getQualifiedName()); // extends ?
if (WikittyTransformerUtil.isBusinessEntity(superClass)) {
// superclass must have benn processed first to have its operations set
if (! processedClasses.containsKey(superClass)) {
- processClass(superClass);
+ processEntity(superClass);
}
// getting the signatures of thoses operation
@@ -177,6 +179,6 @@
}
}
- processedClasses.put(clazz, contract);
+ processedClasses.put(businessEntity, contract);
}
}
Modified: branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java
===================================================================
--- branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java 2010-08-18 15:40:40 UTC (rev 269)
+++ branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java 2010-08-18 15:56:12 UTC (rev 270)
@@ -18,6 +18,10 @@
@Override
public void transformFromClass(ObjectModelClass clazz) {
+
+ if (! WikittyTransformerUtil.isBusinessEntity(clazz)) {
+ return ;
+ }
ObjectModelClass helper = createClass(clazz.getName() + "Helper", clazz.getPackageName());
Modified: branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyImplementationGenerator.java
===================================================================
--- branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyImplementationGenerator.java 2010-08-18 15:40:40 UTC (rev 269)
+++ branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyImplementationGenerator.java 2010-08-18 15:56:12 UTC (rev 270)
@@ -18,6 +18,11 @@
@Override
public void transformFromClass(ObjectModelClass clazz) {
+
+ if (! WikittyTransformerUtil.isBusinessEntity(clazz)) {
+ return ;
+ }
+
ObjectModelClass implementation = createClass(clazz.getName() + "Impl", clazz.getPackageName());
// TODO 20100811 bleny remove unused imports
1
0
Author: bleny
Date: 2010-08-18 17:40:40 +0200 (Wed, 18 Aug 2010)
New Revision: 269
Url: http://nuiton.org/repositories/revision/wikitty/269
Log:
presentation wikitty v3
Added:
trunk/src/site/schema_wikitty_architecture_client_serveur.svg
Modified:
trunk/src/site/presentation_Wikitty_2010-08-20.odp
trunk/src/site/schema_wikitty_architecture.svg
Modified: trunk/src/site/presentation_Wikitty_2010-08-20.odp
===================================================================
(Binary files differ)
Modified: trunk/src/site/schema_wikitty_architecture.svg
===================================================================
--- trunk/src/site/schema_wikitty_architecture.svg 2010-08-18 14:41:13 UTC (rev 268)
+++ trunk/src/site/schema_wikitty_architecture.svg 2010-08-18 15:40:40 UTC (rev 269)
@@ -10,8 +10,8 @@
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="714.0625"
- height="252.14418"
+ width="378.56122"
+ height="244.17543"
id="svg2"
version="1.1"
inkscape:version="0.47 r22583"
@@ -99,7 +99,7 @@
xlink:href="#linearGradient3934"
id="linearGradient3911"
gradientUnits="userSpaceOnUse"
- gradientTransform="translate(217.00317,33.528902)"
+ gradientTransform="translate(-58.314079,33.528902)"
x1="-15.395237"
y1="1.6637709"
x2="226.55714"
@@ -109,101 +109,51 @@
xlink:href="#linearGradient3940"
id="linearGradient3918"
gradientUnits="userSpaceOnUse"
- gradientTransform="translate(217.00317,66.64888)"
+ gradientTransform="translate(-58.314079,66.64888)"
x1="-15.395237"
y1="1.6637709"
x2="226.55714"
y2="103.30186" />
<linearGradient
inkscape:collect="always"
- xlink:href="#linearGradient3946"
- id="linearGradient3952"
+ xlink:href="#linearGradient4069"
+ id="linearGradient4051"
gradientUnits="userSpaceOnUse"
- gradientTransform="translate(0,99.301587)"
+ gradientTransform="translate(-58.314079,132.88889)"
x1="-15.395237"
y1="1.6637709"
x2="226.55714"
y2="103.30186" />
<linearGradient
inkscape:collect="always"
- xlink:href="#linearGradient3594"
- id="linearGradient4015"
+ xlink:href="#linearGradient4075"
+ id="linearGradient4063"
gradientUnits="userSpaceOnUse"
- gradientTransform="translate(-61.333338,0.40887451)"
+ gradientTransform="translate(45.368461,166.24253)"
x1="-15.395237"
y1="1.6637709"
x2="226.55714"
y2="103.30186" />
<linearGradient
inkscape:collect="always"
- xlink:href="#linearGradient3934"
- id="linearGradient4017"
+ xlink:href="#linearGradient3594"
+ id="linearGradient4081"
gradientUnits="userSpaceOnUse"
- gradientTransform="translate(-61.333338,33.528902)"
+ gradientTransform="translate(217.00317,0.40887451)"
x1="-15.395237"
y1="1.6637709"
x2="226.55714"
y2="103.30186" />
<linearGradient
inkscape:collect="always"
- xlink:href="#linearGradient3940"
- id="linearGradient4019"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(-61.333338,66.64888)"
- x1="-15.395237"
- y1="1.6637709"
- x2="226.55714"
- y2="103.30186" />
- <linearGradient
- inkscape:collect="always"
xlink:href="#linearGradient3946"
- id="linearGradient4021"
+ id="linearGradient2913"
gradientUnits="userSpaceOnUse"
- gradientTransform="translate(-278.3365,99.301587)"
+ gradientTransform="translate(-58.314079,99.768872)"
x1="-15.395237"
y1="1.6637709"
x2="226.55714"
y2="103.30186" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3594"
- id="linearGradient4025"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(0,-32.711111)"
- x1="-15.395237"
- y1="1.6637709"
- x2="226.55714"
- y2="103.30186" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4069"
- id="linearGradient4051"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(217.00317,132.88889)"
- x1="-15.395237"
- y1="1.6637709"
- x2="226.55714"
- y2="103.30186" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4075"
- id="linearGradient4063"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(320.68571,166.24253)"
- x1="-15.395237"
- y1="1.6637709"
- x2="226.55714"
- y2="103.30186" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3594"
- id="linearGradient4081"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(217.00317,0.40887451)"
- x1="-15.395237"
- y1="1.6637709"
- x2="226.55714"
- y2="103.30186" />
</defs>
<sodipodi:namedview
id="base"
@@ -213,10 +163,10 @@
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="1.8596728"
- inkscape:cx="345.0223"
- inkscape:cy="122.08773"
+ inkscape:cx="326.93923"
+ inkscape:cy="122.08772"
inkscape:document-units="px"
- inkscape:current-layer="layer2"
+ inkscape:current-layer="layer1"
showgrid="false"
inkscape:window-width="1680"
inkscape:window-height="975"
@@ -231,7 +181,7 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
+ <dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
@@ -239,9 +189,10 @@
inkscape:label="couches"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(247.11814,-10.102128)">
+ transform="translate(247.11814,-18.070878)">
<g
- id="g4040">
+ id="g4040"
+ transform="translate(-275.31725,0)">
<rect
ry="4.9650793"
style="fill:url(#linearGradient4081);fill-opacity:1;stroke:#000000;stroke-opacity:1"
@@ -266,186 +217,79 @@
ry="4.9650793"
style="fill:url(#linearGradient3911);fill-opacity:1;stroke:#000000;stroke-opacity:1"
y="77.103783"
- x="256.13968"
+ x="-19.17757"
height="28.914286"
width="150.12064"
id="rect3641" />
<text
id="text3637"
y="96.274796"
- x="306.32693"
+ x="31.009686"
style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
xml:space="preserve"><tspan
style="font-size:12px"
y="96.274796"
- x="306.32693"
+ x="31.009686"
sodipodi:role="line"
id="tspan3782">Sécurité</tspan></text>
<rect
id="rect3651"
width="150.12064"
height="28.914286"
- x="256.13968"
+ x="-19.17757"
y="110.22376"
style="fill:url(#linearGradient3918);fill-opacity:1;stroke:#000000;stroke-opacity:1"
ry="4.9650793" />
<text
xml:space="preserve"
style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
- x="312.50272"
+ x="37.185467"
y="129.15454"
id="text3647"><tspan
sodipodi:role="line"
id="tspan3649"
- x="312.50272"
+ x="37.185467"
y="129.15454"
style="font-size:12px">Cache</tspan></text>
- <g
- id="g3816"
- transform="translate(217.00317,0.46728516)">
- <rect
- id="rect3661"
- width="150.12064"
- height="28.914286"
- x="39.136509"
- y="142.87646"
- style="fill:url(#linearGradient3952);fill-opacity:1;stroke:#000000;stroke-opacity:1"
- ry="4.9650793" />
- <text
- xml:space="preserve"
- style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
- x="79.682175"
- y="160.64417"
- id="text3657"><tspan
- sodipodi:role="line"
- id="tspan3659"
- x="79.682175"
- y="160.64417"
- style="font-size:12px">Notification</tspan></text>
- <rect
- ry="4.9650793"
- style="fill:url(#linearGradient4021);fill-opacity:1;stroke:#000000;stroke-opacity:1"
- y="142.87646"
- x="-239.2"
- height="28.914286"
- width="150.12064"
- id="rect3993" />
- <text
- id="text3995"
- y="160.64417"
- x="-198.65433"
- style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
- xml:space="preserve"><tspan
- style="font-size:12px"
- y="160.64417"
- x="-198.65433"
- id="tspan3997"
- sodipodi:role="line">Notification</tspan></text>
- </g>
<rect
+ ry="4.9650793"
+ style="fill:url(#linearGradient2913);fill-opacity:1;stroke:#000000;stroke-opacity:1"
+ y="143.34375"
+ x="-19.17757"
+ height="28.914286"
+ width="150.12064"
+ id="rect3661" />
+ <text
+ id="text3657"
+ y="161.11145"
+ x="21.368084"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ xml:space="preserve"><tspan
+ style="font-size:12px"
+ y="161.11145"
+ x="21.368084"
+ id="tspan3659"
+ sodipodi:role="line">Notification</tspan></text>
+ <rect
id="rect3828"
width="150.12064"
height="85.282539"
- x="256.13968"
+ x="-19.17757"
y="176.46378"
style="fill:url(#linearGradient4051);fill-opacity:1;stroke:#000000;stroke-opacity:1"
ry="4.9650793" />
<text
xml:space="preserve"
style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
- x="296.59454"
+ x="21.277294"
y="194.23146"
id="text3830"><tspan
sodipodi:role="line"
id="tspan3832"
- x="296.59454"
+ x="21.277294"
y="194.23146"
style="font-size:12px">Persistance</tspan></text>
- <rect
- ry="4.9650793"
- style="fill:url(#linearGradient4015);fill-opacity:1;stroke:#000000;stroke-opacity:1"
- y="43.983757"
- x="-22.196829"
- height="28.914286"
- width="150.12064"
- id="rect3975" />
- <text
- id="text3977"
- y="61.751446"
- x="8.0187464"
- style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
- xml:space="preserve"><tspan
- style="font-size:12px"
- y="61.751446"
- x="8.0187464"
- id="tspan3979"
- sodipodi:role="line">Wikitty Service</tspan></text>
- <rect
- id="rect3981"
- width="150.12064"
- height="28.914286"
- x="-22.196829"
- y="77.103783"
- style="fill:url(#linearGradient4017);fill-opacity:1;stroke:#000000;stroke-opacity:1"
- ry="4.9650793" />
- <text
- xml:space="preserve"
- style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
- x="27.990425"
- y="96.274796"
- id="text3983"><tspan
- id="tspan3985"
- sodipodi:role="line"
- x="27.990425"
- y="96.274796"
- style="font-size:12px">Sécurité</tspan></text>
- <rect
- ry="4.9650793"
- style="fill:url(#linearGradient4019);fill-opacity:1;stroke:#000000;stroke-opacity:1"
- y="110.22376"
- x="-22.196829"
- height="28.914286"
- width="150.12064"
- id="rect3987" />
- <text
- id="text3989"
- y="129.15454"
- x="34.166206"
- style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
- xml:space="preserve"><tspan
- style="font-size:12px"
- y="129.15454"
- x="34.166206"
- id="tspan3991"
- sodipodi:role="line">Cache</tspan></text>
- <g
- transform="translate(-61.333338,165.6)"
- id="g4007">
- <rect
- id="rect4009"
- width="150.12064"
- height="28.914286"
- x="39.136509"
- y="10.863771"
- style="fill:url(#linearGradient4025);fill-opacity:1;stroke:#000000;stroke-opacity:1"
- ry="4.9650793" />
- <text
- xml:space="preserve"
- style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
- x="69.352097"
- y="28.63146"
- id="text4011"><tspan
- sodipodi:role="line"
- id="tspan4013"
- x="69.352097"
- y="28.63146"
- style="font-size:12px">Wikitty Service</tspan></text>
- </g>
<path
- style="fill:#ececec;stroke:#000000;stroke-opacity:1"
- d="m 232.6875,49.15625 c -0.19234,-0.01054 -0.33803,0.03632 -0.4375,0.09375 -0.5357,0.309289 -0.88742,2.43629 -1.0625,5.09375 l -49.53125,0 c -2.26524,0 -4.09375,1.828505 -4.09375,4.09375 0,0.05295 0.0293,0.103831 0.0312,0.15625 -0.002,0.05469 -0.0312,0.100967 -0.0312,0.15625 l 0,127.65625 -38.375,0 c -1.87039,0 -3.375,1.50461 -3.375,3.375 l 0,1.40625 c 0,1.87039 1.50461,3.375 3.375,3.375 l 43.1875,0 c 1.87039,0 3.375,-1.50461 3.375,-3.375 l 0,-1.28125 0,-0.125 0,-127.28125 45.4375,0 c 0.17485,2.662148 0.52614,4.81533 1.0625,5.125 1.59155,0.91888 15.90625,-7.349739 15.90625,-9.1875 0,-1.722901 -12.58368,-9.123093 -15.46875,-9.28125 z"
- id="rect4027" />
- <path
d="m 488.03811,153.09869 c 0,4.51647 -11.89928,8.17778 -26.57778,8.17778 -14.6785,0 -26.57778,-3.66131 -26.57778,-8.17778 0,-4.51646 11.89928,-8.17777 26.57778,-8.17777 14.6785,0 26.57778,3.66131 26.57778,8.17777 z"
sodipodi:ry="8.1777782"
sodipodi:rx="26.577778"
@@ -454,9 +298,9 @@
id="path4059"
style="fill:#ececec;stroke:#000000;stroke-opacity:1"
sodipodi:type="arc"
- transform="translate(-169.39683,91.707937)" />
+ transform="translate(-444.71408,91.707937)" />
<path
- transform="translate(-169.39683,82.751288)"
+ transform="translate(-444.71408,82.751288)"
sodipodi:type="arc"
style="fill:#ececec;stroke:#000000;stroke-opacity:1"
id="path4057"
@@ -474,7 +318,7 @@
id="path4055"
style="fill:#ececec;stroke:#000000;stroke-opacity:1"
sodipodi:type="arc"
- transform="translate(-169.39683,73.794682)" />
+ transform="translate(-444.71408,73.794682)" />
<path
sodipodi:type="arc"
style="fill:#ececec;stroke:#000000;stroke-opacity:1"
@@ -484,24 +328,24 @@
sodipodi:rx="26.577778"
sodipodi:ry="8.1777782"
d="m 488.03811,153.09869 c 0,4.51647 -11.89928,8.17778 -26.57778,8.17778 -14.6785,0 -26.57778,-3.66131 -26.57778,-8.17778 0,-4.51646 11.89928,-8.17777 26.57778,-8.17777 14.6785,0 26.57778,3.66131 26.57778,8.17777 z"
- transform="translate(-169.39683,64.838095)" />
+ transform="translate(-444.71408,64.838095)" />
<rect
ry="4.9650793"
style="fill:url(#linearGradient4063);fill-opacity:1;stroke:#000000;stroke-opacity:1"
y="209.81741"
- x="327.11108"
+ x="51.793835"
height="28.914286"
width="71.555511"
id="rect4061" />
<text
id="text4065"
y="227.81876"
- x="331.11639"
+ x="55.799145"
style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
xml:space="preserve"><tspan
style="font-size:12px"
y="227.81876"
- x="331.11639"
+ x="55.799145"
id="tspan4067"
sodipodi:role="line">Indexation</tspan></text>
<g
@@ -534,93 +378,4 @@
transform="translate(-22.696829,43.483757)"
id="path4106" />
</g>
- <g
- inkscape:groupmode="layer"
- id="layer2"
- inkscape:label="technos"
- style="display:inline"
- transform="translate(-1e-6,7.96875)">
- <path
- style="fill:#ffffff;stroke:#999999;stroke-opacity:1"
- d="m 179.59375,126.9375 c -16.33387,0 -29.5625,6.87983 -29.5625,15.34375 0,8.46392 13.22863,15.3125 29.5625,15.3125 14.73964,0 26.97351,-5.56469 29.21875,-12.875 l 19.71875,-5.40625 -19.90625,0 c -2.66028,-7.04819 -14.65054,-12.375 -29.03125,-12.375 z"
- id="path4123" />
- <text
- xml:space="preserve"
- style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
- x="160.79045"
- y="144.94669"
- id="text4119"><tspan
- sodipodi:role="line"
- id="tspan4121"
- x="160.79045"
- y="144.94669"
- style="font-size:10px;fill:#666666">JGroups</tspan></text>
- <path
- style="fill:#ffffff;stroke:#999999;stroke-opacity:1"
- d="m 457.625,187.71875 c -14.9527,0 -27.32896,5.75306 -29.3125,13.21875 -2.64058,-4.1889 -7.79772,-7.03125 -13.71875,-7.03125 -8.61241,0 -15.59375,6.01301 -15.59375,13.4375 0,7.06948 6.33458,12.83747 14.375,13.375 -2.87507,2.10833 -4.5,4.52399 -4.5,7.0625 0,8.46392 18.03904,15.3125 40.3125,15.3125 22.27346,0 40.34375,-6.84858 40.34375,-15.3125 0,-4.8782 -6.02863,-9.22455 -15.375,-12.03125 5.49509,-1.9237 9.66863,-4.77201 11.6875,-8.125 l 22.84375,0 -21.5625,-3.6875 c 0.0348,-0.30491 0.0625,-0.59687 0.0625,-0.90625 0,-8.46392 -13.22863,-15.3125 -29.5625,-15.3125 z m -27.53125,20.9375 c 1.32768,1.74748 3.28859,3.32236 5.6875,4.6875 -2.92858,0.39347 -5.70756,0.90484 -8.28125,1.53125 1.42887,-1.81064 2.33543,-3.92161 2.59375,-6.21875 z"
- id="path4125" />
- <text
- id="text4127"
- y="211.05193"
- x="407.65793"
- style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
- xml:space="preserve"><tspan
- style="font-size:10px;fill:#666666"
- y="211.05193"
- x="407.65793"
- id="tspan4129"
- sodipodi:role="line">H2</tspan></text>
- <text
- xml:space="preserve"
- style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
- x="420.15561"
- y="230.44559"
- id="text4133"><tspan
- sodipodi:role="line"
- id="tspan4135"
- x="420.15561"
- y="230.44559"
- style="font-size:10px;fill:#666666">PostgreSQL</tspan></text>
- <text
- id="text4139"
- y="206.61336"
- x="441.44528"
- style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
- xml:space="preserve"><tspan
- style="font-size:10px;fill:#666666"
- y="206.61336"
- x="441.44528"
- id="tspan4141"
- sodipodi:role="line">HBase</tspan></text>
- <path
- style="fill:#ffffff;stroke:#999999;stroke-opacity:1"
- d="m 691.53125,199 c -10.18105,0 -18.74639,3.28902 -21.28125,7.75 l -27.125,-2.90625 26.46875,6.71875 c 1.12902,5.28749 10.52235,9.40625 21.9375,9.40625 12.17616,0 22.03125,-4.67765 22.03125,-10.46875 0,-5.7911 -9.85509,-10.5 -22.03125,-10.5 z"
- id="path4143" />
- <text
- xml:space="preserve"
- style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
- x="680.24261"
- y="213.21994"
- id="text4145"><tspan
- sodipodi:role="line"
- id="tspan4147"
- x="680.24261"
- y="213.21994"
- style="font-size:10px;fill:#666666">SolR</tspan></text>
- <path
- style="fill:#ffffff;stroke:#999999;stroke-opacity:1"
- d="m 418.90625,-7.46875 c -16.33387,0 -29.59375,6.84858357 -29.59375,15.3125 0,8.463916 13.25988,15.3125 29.59375,15.3125 0.54232,0 1.05862,-0.01631 1.59375,-0.03125 l 10.75,17.25 -4.625,-17.78125 c 12.57449,-1.764711 21.84375,-7.675786 21.84375,-14.75 0,-8.46391643 -13.22863,-15.3125 -29.5625,-15.3125 z"
- id="path4157" />
- <text
- id="text4159"
- y="10.514438"
- x="400.07986"
- style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
- xml:space="preserve"><tspan
- style="font-size:10px;fill:#666666"
- y="10.514438"
- x="400.07986"
- id="tspan4161"
- sodipodi:role="line">Hessian</tspan></text>
- </g>
</svg>
Copied: trunk/src/site/schema_wikitty_architecture_client_serveur.svg (from rev 268, trunk/src/site/schema_wikitty_architecture.svg)
===================================================================
--- trunk/src/site/schema_wikitty_architecture_client_serveur.svg (rev 0)
+++ trunk/src/site/schema_wikitty_architecture_client_serveur.svg 2010-08-18 15:40:40 UTC (rev 269)
@@ -0,0 +1,626 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="714.0625"
+ height="252.14418"
+ id="svg2"
+ version="1.1"
+ inkscape:version="0.47 r22583"
+ sodipodi:docname="schema_wikitty_architecture.svg"
+ inkscape:export-filename="/home/bleny/Bureau/schema_wikitty_architecture_technos.png"
+ inkscape:export-xdpi="281.88724"
+ inkscape:export-ydpi="281.88724">
+ <defs
+ id="defs4">
+ <linearGradient
+ id="linearGradient4075">
+ <stop
+ style="stop-color:#12ebe7;stop-opacity:0.57647061;"
+ offset="0"
+ id="stop4077" />
+ <stop
+ style="stop-color:#12ebe7;stop-opacity:0.08627451;"
+ offset="1"
+ id="stop4079" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4069">
+ <stop
+ id="stop4071"
+ offset="0"
+ style="stop-color:#3eb43e;stop-opacity:0.57647061;" />
+ <stop
+ id="stop4073"
+ offset="1"
+ style="stop-color:#3eb43e;stop-opacity:0.08627451;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3946">
+ <stop
+ id="stop3948"
+ offset="0"
+ style="stop-color:#fdff2e;stop-opacity:0.57647061;" />
+ <stop
+ id="stop3950"
+ offset="1"
+ style="stop-color:#fdff2e;stop-opacity:0.08627451;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3940">
+ <stop
+ id="stop3942"
+ offset="0"
+ style="stop-color:#c154e7;stop-opacity:0.57647061;" />
+ <stop
+ id="stop3944"
+ offset="1"
+ style="stop-color:#c154e7;stop-opacity:0.08627451;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3934">
+ <stop
+ id="stop3936"
+ offset="0"
+ style="stop-color:#ef595e;stop-opacity:0.57647061;" />
+ <stop
+ id="stop3938"
+ offset="1"
+ style="stop-color:#ef595e;stop-opacity:0.08627451;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3594">
+ <stop
+ style="stop-color:#668ad3;stop-opacity:0.57480317;"
+ offset="0"
+ id="stop3596" />
+ <stop
+ style="stop-color:#668ad3;stop-opacity:0.08661418;"
+ offset="1"
+ id="stop3598" />
+ </linearGradient>
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 526.18109 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="744.09448 : 526.18109 : 1"
+ inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+ id="perspective10" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3934"
+ id="linearGradient3911"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(217.00317,33.528902)"
+ x1="-15.395237"
+ y1="1.6637709"
+ x2="226.55714"
+ y2="103.30186" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3940"
+ id="linearGradient3918"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(217.00317,66.64888)"
+ x1="-15.395237"
+ y1="1.6637709"
+ x2="226.55714"
+ y2="103.30186" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3946"
+ id="linearGradient3952"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(0,99.301587)"
+ x1="-15.395237"
+ y1="1.6637709"
+ x2="226.55714"
+ y2="103.30186" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3594"
+ id="linearGradient4015"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(-61.333338,0.40887451)"
+ x1="-15.395237"
+ y1="1.6637709"
+ x2="226.55714"
+ y2="103.30186" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3934"
+ id="linearGradient4017"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(-61.333338,33.528902)"
+ x1="-15.395237"
+ y1="1.6637709"
+ x2="226.55714"
+ y2="103.30186" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3940"
+ id="linearGradient4019"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(-61.333338,66.64888)"
+ x1="-15.395237"
+ y1="1.6637709"
+ x2="226.55714"
+ y2="103.30186" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3946"
+ id="linearGradient4021"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(-278.3365,99.301587)"
+ x1="-15.395237"
+ y1="1.6637709"
+ x2="226.55714"
+ y2="103.30186" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3594"
+ id="linearGradient4025"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(0,-32.711111)"
+ x1="-15.395237"
+ y1="1.6637709"
+ x2="226.55714"
+ y2="103.30186" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4069"
+ id="linearGradient4051"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(217.00317,132.88889)"
+ x1="-15.395237"
+ y1="1.6637709"
+ x2="226.55714"
+ y2="103.30186" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4075"
+ id="linearGradient4063"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(320.68571,166.24253)"
+ x1="-15.395237"
+ y1="1.6637709"
+ x2="226.55714"
+ y2="103.30186" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3594"
+ id="linearGradient4081"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(217.00317,0.40887451)"
+ x1="-15.395237"
+ y1="1.6637709"
+ x2="226.55714"
+ y2="103.30186" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="1.8596728"
+ inkscape:cx="326.93923"
+ inkscape:cy="122.08771"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer2"
+ showgrid="false"
+ inkscape:window-width="1680"
+ inkscape:window-height="975"
+ inkscape:window-x="0"
+ inkscape:window-y="24"
+ inkscape:window-maximized="1" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="couches"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(247.11814,-10.102128)">
+ <g
+ id="g4040">
+ <rect
+ ry="4.9650793"
+ style="fill:url(#linearGradient4081);fill-opacity:1;stroke:#000000;stroke-opacity:1"
+ y="43.983757"
+ x="256.13968"
+ height="28.914286"
+ width="150.12064"
+ id="rect2820" />
+ <text
+ id="text2816"
+ y="61.751446"
+ x="286.35526"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ xml:space="preserve"><tspan
+ style="font-size:12px"
+ y="61.751446"
+ x="286.35526"
+ id="tspan2818"
+ sodipodi:role="line">Wikitty Service</tspan></text>
+ </g>
+ <rect
+ ry="4.9650793"
+ style="fill:url(#linearGradient3911);fill-opacity:1;stroke:#000000;stroke-opacity:1"
+ y="77.103783"
+ x="256.13968"
+ height="28.914286"
+ width="150.12064"
+ id="rect3641" />
+ <text
+ id="text3637"
+ y="96.274796"
+ x="306.32693"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ xml:space="preserve"><tspan
+ style="font-size:12px"
+ y="96.274796"
+ x="306.32693"
+ sodipodi:role="line"
+ id="tspan3782">Sécurité</tspan></text>
+ <rect
+ id="rect3651"
+ width="150.12064"
+ height="28.914286"
+ x="256.13968"
+ y="110.22376"
+ style="fill:url(#linearGradient3918);fill-opacity:1;stroke:#000000;stroke-opacity:1"
+ ry="4.9650793" />
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ x="312.50272"
+ y="129.15454"
+ id="text3647"><tspan
+ sodipodi:role="line"
+ id="tspan3649"
+ x="312.50272"
+ y="129.15454"
+ style="font-size:12px">Cache</tspan></text>
+ <g
+ id="g3816"
+ transform="translate(217.00317,0.46728516)">
+ <rect
+ id="rect3661"
+ width="150.12064"
+ height="28.914286"
+ x="39.136509"
+ y="142.87646"
+ style="fill:url(#linearGradient3952);fill-opacity:1;stroke:#000000;stroke-opacity:1"
+ ry="4.9650793" />
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ x="79.682175"
+ y="160.64417"
+ id="text3657"><tspan
+ sodipodi:role="line"
+ id="tspan3659"
+ x="79.682175"
+ y="160.64417"
+ style="font-size:12px">Notification</tspan></text>
+ <rect
+ ry="4.9650793"
+ style="fill:url(#linearGradient4021);fill-opacity:1;stroke:#000000;stroke-opacity:1"
+ y="142.87646"
+ x="-239.2"
+ height="28.914286"
+ width="150.12064"
+ id="rect3993" />
+ <text
+ id="text3995"
+ y="160.64417"
+ x="-198.65433"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ xml:space="preserve"><tspan
+ style="font-size:12px"
+ y="160.64417"
+ x="-198.65433"
+ id="tspan3997"
+ sodipodi:role="line">Notification</tspan></text>
+ </g>
+ <rect
+ id="rect3828"
+ width="150.12064"
+ height="85.282539"
+ x="256.13968"
+ y="176.46378"
+ style="fill:url(#linearGradient4051);fill-opacity:1;stroke:#000000;stroke-opacity:1"
+ ry="4.9650793" />
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ x="296.59454"
+ y="194.23146"
+ id="text3830"><tspan
+ sodipodi:role="line"
+ id="tspan3832"
+ x="296.59454"
+ y="194.23146"
+ style="font-size:12px">Persistance</tspan></text>
+ <rect
+ ry="4.9650793"
+ style="fill:url(#linearGradient4015);fill-opacity:1;stroke:#000000;stroke-opacity:1"
+ y="43.983757"
+ x="-22.196829"
+ height="28.914286"
+ width="150.12064"
+ id="rect3975" />
+ <text
+ id="text3977"
+ y="61.751446"
+ x="8.0187464"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ xml:space="preserve"><tspan
+ style="font-size:12px"
+ y="61.751446"
+ x="8.0187464"
+ id="tspan3979"
+ sodipodi:role="line">Wikitty Service</tspan></text>
+ <rect
+ id="rect3981"
+ width="150.12064"
+ height="28.914286"
+ x="-22.196829"
+ y="77.103783"
+ style="fill:url(#linearGradient4017);fill-opacity:1;stroke:#000000;stroke-opacity:1"
+ ry="4.9650793" />
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ x="27.990425"
+ y="96.274796"
+ id="text3983"><tspan
+ id="tspan3985"
+ sodipodi:role="line"
+ x="27.990425"
+ y="96.274796"
+ style="font-size:12px">Sécurité</tspan></text>
+ <rect
+ ry="4.9650793"
+ style="fill:url(#linearGradient4019);fill-opacity:1;stroke:#000000;stroke-opacity:1"
+ y="110.22376"
+ x="-22.196829"
+ height="28.914286"
+ width="150.12064"
+ id="rect3987" />
+ <text
+ id="text3989"
+ y="129.15454"
+ x="34.166206"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ xml:space="preserve"><tspan
+ style="font-size:12px"
+ y="129.15454"
+ x="34.166206"
+ id="tspan3991"
+ sodipodi:role="line">Cache</tspan></text>
+ <g
+ transform="translate(-61.333338,165.6)"
+ id="g4007">
+ <rect
+ id="rect4009"
+ width="150.12064"
+ height="28.914286"
+ x="39.136509"
+ y="10.863771"
+ style="fill:url(#linearGradient4025);fill-opacity:1;stroke:#000000;stroke-opacity:1"
+ ry="4.9650793" />
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ x="69.352097"
+ y="28.63146"
+ id="text4011"><tspan
+ sodipodi:role="line"
+ id="tspan4013"
+ x="69.352097"
+ y="28.63146"
+ style="font-size:12px">Wikitty Service</tspan></text>
+ </g>
+ <path
+ style="fill:#ececec;stroke:#000000;stroke-opacity:1"
+ d="m 232.6875,49.15625 c -0.19234,-0.01054 -0.33803,0.03632 -0.4375,0.09375 -0.5357,0.309289 -0.88742,2.43629 -1.0625,5.09375 l -49.53125,0 c -2.26524,0 -4.09375,1.828505 -4.09375,4.09375 0,0.05295 0.0293,0.103831 0.0312,0.15625 -0.002,0.05469 -0.0312,0.100967 -0.0312,0.15625 l 0,127.65625 -38.375,0 c -1.87039,0 -3.375,1.50461 -3.375,3.375 l 0,1.40625 c 0,1.87039 1.50461,3.375 3.375,3.375 l 43.1875,0 c 1.87039,0 3.375,-1.50461 3.375,-3.375 l 0,-1.28125 0,-0.125 0,-127.28125 45.4375,0 c 0.17485,2.662148 0.52614,4.81533 1.0625,5.125 1.59155,0.91888 15.90625,-7.349739 15.90625,-9.1875 0,-1.722901 -12.58368,-9.123093 -15.46875,-9.28125 z"
+ id="rect4027" />
+ <path
+ d="m 488.03811,153.09869 c 0,4.51647 -11.89928,8.17778 -26.57778,8.17778 -14.6785,0 -26.57778,-3.66131 -26.57778,-8.17778 0,-4.51646 11.89928,-8.17777 26.57778,-8.17777 14.6785,0 26.57778,3.66131 26.57778,8.17777 z"
+ sodipodi:ry="8.1777782"
+ sodipodi:rx="26.577778"
+ sodipodi:cy="153.09869"
+ sodipodi:cx="461.46033"
+ id="path4059"
+ style="fill:#ececec;stroke:#000000;stroke-opacity:1"
+ sodipodi:type="arc"
+ transform="translate(-169.39683,91.707937)" />
+ <path
+ transform="translate(-169.39683,82.751288)"
+ sodipodi:type="arc"
+ style="fill:#ececec;stroke:#000000;stroke-opacity:1"
+ id="path4057"
+ sodipodi:cx="461.46033"
+ sodipodi:cy="153.09869"
+ sodipodi:rx="26.577778"
+ sodipodi:ry="8.1777782"
+ d="m 488.03811,153.09869 c 0,4.51647 -11.89928,8.17778 -26.57778,8.17778 -14.6785,0 -26.57778,-3.66131 -26.57778,-8.17778 0,-4.51646 11.89928,-8.17777 26.57778,-8.17777 14.6785,0 26.57778,3.66131 26.57778,8.17777 z" />
+ <path
+ d="m 488.03811,153.09869 c 0,4.51647 -11.89928,8.17778 -26.57778,8.17778 -14.6785,0 -26.57778,-3.66131 -26.57778,-8.17778 0,-4.51646 11.89928,-8.17777 26.57778,-8.17777 14.6785,0 26.57778,3.66131 26.57778,8.17777 z"
+ sodipodi:ry="8.1777782"
+ sodipodi:rx="26.577778"
+ sodipodi:cy="153.09869"
+ sodipodi:cx="461.46033"
+ id="path4055"
+ style="fill:#ececec;stroke:#000000;stroke-opacity:1"
+ sodipodi:type="arc"
+ transform="translate(-169.39683,73.794682)" />
+ <path
+ sodipodi:type="arc"
+ style="fill:#ececec;stroke:#000000;stroke-opacity:1"
+ id="path4053"
+ sodipodi:cx="461.46033"
+ sodipodi:cy="153.09869"
+ sodipodi:rx="26.577778"
+ sodipodi:ry="8.1777782"
+ d="m 488.03811,153.09869 c 0,4.51647 -11.89928,8.17778 -26.57778,8.17778 -14.6785,0 -26.57778,-3.66131 -26.57778,-8.17778 0,-4.51646 11.89928,-8.17777 26.57778,-8.17777 14.6785,0 26.57778,3.66131 26.57778,8.17777 z"
+ transform="translate(-169.39683,64.838095)" />
+ <rect
+ ry="4.9650793"
+ style="fill:url(#linearGradient4063);fill-opacity:1;stroke:#000000;stroke-opacity:1"
+ y="209.81741"
+ x="327.11108"
+ height="28.914286"
+ width="71.555511"
+ id="rect4061" />
+ <text
+ id="text4065"
+ y="227.81876"
+ x="331.11639"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ xml:space="preserve"><tspan
+ style="font-size:12px"
+ y="227.81876"
+ x="331.11639"
+ id="tspan4067"
+ sodipodi:role="line">Indexation</tspan></text>
+ <g
+ id="g4109"
+ transform="translate(30.372791,-27.900587)">
+ <path
+ id="path4083"
+ d="m -225.58468,46.471515 c -16.68438,0 -30.61989,6.194421 -34,14.46875 -10.46987,4.690678 -17.40625,12.80906 -17.40625,22.0625 0,8.071994 5.29836,15.298526 13.59375,20.124995 -0.002,0.01 0.002,0.0213 0,0.0312 -0.10912,0.62925 -0.15625,1.2914 -0.15625,1.9375 0,10.33773 14.31659,18.71875 31.96875,18.71875 10.44893,0 19.69924,-2.95942 25.53125,-7.5 4.3808,1.38215 9.47106,2.1875 14.90625,2.1875 15.83384,0 28.77358,-6.72597 29.625,-15.1875 18.38337,-0.0827 33.21875,-7.329033 33.21875,-16.249995 0,-5.619342 -5.88789,-10.551604 -14.84375,-13.46875 0.003,-0.103705 0.0312,-0.208457 0.0312,-0.3125 0,-12.288245 -20.01349,-22.25 -44.6875,-22.25 -4.47883,0 -8.79573,0.357956 -12.875,0.96875 -6.31832,-3.421172 -15.14045,-5.53125 -24.90625,-5.53125 z"
+ style="fill:#e3dbdb;stroke:#000000;stroke-opacity:1" />
+ <text
+ id="text4100"
+ y="76.368225"
+ x="-209.19235"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#483737;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ xml:space="preserve"><tspan
+ style="font-size:12px;font-weight:bold;text-align:center;text-anchor:middle;fill:#483737;-inkscape-font-specification:Bitstream Charter Bold"
+ y="76.368225"
+ x="-209.19235"
+ id="tspan4102"
+ sodipodi:role="line">Application</tspan><tspan
+ id="tspan4104"
+ style="font-size:12px;font-weight:bold;text-align:center;text-anchor:middle;fill:#483737;-inkscape-font-specification:Bitstream Charter Bold"
+ y="91.368225"
+ x="-209.19235"
+ sodipodi:role="line">Utilisateur</tspan></text>
+ </g>
+ <path
+ style="fill:#ececec;stroke:#000000;stroke-opacity:1"
+ d="m -24.59375,5.6875 c -0.0729,0.017576 -0.106515,0.065035 -0.15625,0.09375 -0.5357,0.309289 -0.88742,2.43629 -1.0625,5.09375 l -38.8125,0 0,8.15625 38.8125,0 c 0.17485,2.662148 0.52614,4.81533 1.0625,5.125 1.59155,0.91888 15.90625,-7.349739 15.90625,-9.1875 0,-1.722901 -12.58368,-9.123093 -15.46875,-9.28125 -0.09617,-0.00527 -0.208351,-0.017576 -0.28125,0 z"
+ transform="translate(-22.696829,43.483757)"
+ id="path4106" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer2"
+ inkscape:label="technos"
+ style="display:inline"
+ transform="translate(-1e-6,7.96875)">
+ <path
+ style="fill:#ffffff;stroke:#999999;stroke-opacity:1"
+ d="m 179.59375,126.9375 c -16.33387,0 -29.5625,6.87983 -29.5625,15.34375 0,8.46392 13.22863,15.3125 29.5625,15.3125 14.73964,0 26.97351,-5.56469 29.21875,-12.875 l 19.71875,-5.40625 -19.90625,0 c -2.66028,-7.04819 -14.65054,-12.375 -29.03125,-12.375 z"
+ id="path4123" />
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ x="160.79045"
+ y="144.94669"
+ id="text4119"><tspan
+ sodipodi:role="line"
+ id="tspan4121"
+ x="160.79045"
+ y="144.94669"
+ style="font-size:10px;fill:#666666">JGroups</tspan></text>
+ <path
+ style="fill:#ffffff;stroke:#999999;stroke-opacity:1"
+ d="m 457.625,187.71875 c -14.9527,0 -27.32896,5.75306 -29.3125,13.21875 -2.64058,-4.1889 -7.79772,-7.03125 -13.71875,-7.03125 -8.61241,0 -15.59375,6.01301 -15.59375,13.4375 0,7.06948 6.33458,12.83747 14.375,13.375 -2.87507,2.10833 -4.5,4.52399 -4.5,7.0625 0,8.46392 18.03904,15.3125 40.3125,15.3125 22.27346,0 40.34375,-6.84858 40.34375,-15.3125 0,-4.8782 -6.02863,-9.22455 -15.375,-12.03125 5.49509,-1.9237 9.66863,-4.77201 11.6875,-8.125 l 22.84375,0 -21.5625,-3.6875 c 0.0348,-0.30491 0.0625,-0.59687 0.0625,-0.90625 0,-8.46392 -13.22863,-15.3125 -29.5625,-15.3125 z m -27.53125,20.9375 c 1.32768,1.74748 3.28859,3.32236 5.6875,4.6875 -2.92858,0.39347 -5.70756,0.90484 -8.28125,1.53125 1.42887,-1.81064 2.33543,-3.92161 2.59375,-6.21875 z"
+ id="path4125" />
+ <text
+ id="text4127"
+ y="211.05193"
+ x="407.65793"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ xml:space="preserve"><tspan
+ style="font-size:10px;fill:#666666"
+ y="211.05193"
+ x="407.65793"
+ id="tspan4129"
+ sodipodi:role="line">H2</tspan></text>
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ x="420.15561"
+ y="230.44559"
+ id="text4133"><tspan
+ sodipodi:role="line"
+ id="tspan4135"
+ x="420.15561"
+ y="230.44559"
+ style="font-size:10px;fill:#666666">PostgreSQL</tspan></text>
+ <text
+ id="text4139"
+ y="206.61336"
+ x="441.44528"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ xml:space="preserve"><tspan
+ style="font-size:10px;fill:#666666"
+ y="206.61336"
+ x="441.44528"
+ id="tspan4141"
+ sodipodi:role="line">HBase</tspan></text>
+ <path
+ style="fill:#ffffff;stroke:#999999;stroke-opacity:1"
+ d="m 691.53125,199 c -10.18105,0 -18.74639,3.28902 -21.28125,7.75 l -27.125,-2.90625 26.46875,6.71875 c 1.12902,5.28749 10.52235,9.40625 21.9375,9.40625 12.17616,0 22.03125,-4.67765 22.03125,-10.46875 0,-5.7911 -9.85509,-10.5 -22.03125,-10.5 z"
+ id="path4143" />
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ x="680.24261"
+ y="213.21994"
+ id="text4145"><tspan
+ sodipodi:role="line"
+ id="tspan4147"
+ x="680.24261"
+ y="213.21994"
+ style="font-size:10px;fill:#666666">SolR</tspan></text>
+ <path
+ style="fill:#ffffff;stroke:#999999;stroke-opacity:1"
+ d="m 418.90625,-7.46875 c -16.33387,0 -29.59375,6.84858357 -29.59375,15.3125 0,8.463916 13.25988,15.3125 29.59375,15.3125 0.54232,0 1.05862,-0.01631 1.59375,-0.03125 l 10.75,17.25 -4.625,-17.78125 c 12.57449,-1.764711 21.84375,-7.675786 21.84375,-14.75 0,-8.46391643 -13.22863,-15.3125 -29.5625,-15.3125 z"
+ id="path4157" />
+ <text
+ id="text4159"
+ y="10.514438"
+ x="400.07986"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ xml:space="preserve"><tspan
+ style="font-size:10px;fill:#666666"
+ y="10.514438"
+ x="400.07986"
+ id="tspan4161"
+ sodipodi:role="line">Hessian</tspan></text>
+ </g>
+</svg>
1
0
Author: bleny
Date: 2010-08-18 16:41:13 +0200 (Wed, 18 Aug 2010)
New Revision: 268
Url: http://nuiton.org/repositories/revision/wikitty/268
Log:
draft presentation wikitty v2
Added:
trunk/src/site/schema_wikitty_architecture.svg
Modified:
trunk/src/site/presentation_Wikitty_2010-08-20.odp
Modified: trunk/src/site/presentation_Wikitty_2010-08-20.odp
===================================================================
(Binary files differ)
Added: trunk/src/site/schema_wikitty_architecture.svg
===================================================================
--- trunk/src/site/schema_wikitty_architecture.svg (rev 0)
+++ trunk/src/site/schema_wikitty_architecture.svg 2010-08-18 14:41:13 UTC (rev 268)
@@ -0,0 +1,626 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="714.0625"
+ height="252.14418"
+ id="svg2"
+ version="1.1"
+ inkscape:version="0.47 r22583"
+ sodipodi:docname="schema_wikitty_architecture.svg"
+ inkscape:export-filename="/home/bleny/Bureau/schema_wikitty_architecture_technos.png"
+ inkscape:export-xdpi="281.88724"
+ inkscape:export-ydpi="281.88724">
+ <defs
+ id="defs4">
+ <linearGradient
+ id="linearGradient4075">
+ <stop
+ style="stop-color:#12ebe7;stop-opacity:0.57647061;"
+ offset="0"
+ id="stop4077" />
+ <stop
+ style="stop-color:#12ebe7;stop-opacity:0.08627451;"
+ offset="1"
+ id="stop4079" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4069">
+ <stop
+ id="stop4071"
+ offset="0"
+ style="stop-color:#3eb43e;stop-opacity:0.57647061;" />
+ <stop
+ id="stop4073"
+ offset="1"
+ style="stop-color:#3eb43e;stop-opacity:0.08627451;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3946">
+ <stop
+ id="stop3948"
+ offset="0"
+ style="stop-color:#fdff2e;stop-opacity:0.57647061;" />
+ <stop
+ id="stop3950"
+ offset="1"
+ style="stop-color:#fdff2e;stop-opacity:0.08627451;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3940">
+ <stop
+ id="stop3942"
+ offset="0"
+ style="stop-color:#c154e7;stop-opacity:0.57647061;" />
+ <stop
+ id="stop3944"
+ offset="1"
+ style="stop-color:#c154e7;stop-opacity:0.08627451;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3934">
+ <stop
+ id="stop3936"
+ offset="0"
+ style="stop-color:#ef595e;stop-opacity:0.57647061;" />
+ <stop
+ id="stop3938"
+ offset="1"
+ style="stop-color:#ef595e;stop-opacity:0.08627451;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3594">
+ <stop
+ style="stop-color:#668ad3;stop-opacity:0.57480317;"
+ offset="0"
+ id="stop3596" />
+ <stop
+ style="stop-color:#668ad3;stop-opacity:0.08661418;"
+ offset="1"
+ id="stop3598" />
+ </linearGradient>
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 526.18109 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="744.09448 : 526.18109 : 1"
+ inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+ id="perspective10" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3934"
+ id="linearGradient3911"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(217.00317,33.528902)"
+ x1="-15.395237"
+ y1="1.6637709"
+ x2="226.55714"
+ y2="103.30186" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3940"
+ id="linearGradient3918"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(217.00317,66.64888)"
+ x1="-15.395237"
+ y1="1.6637709"
+ x2="226.55714"
+ y2="103.30186" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3946"
+ id="linearGradient3952"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(0,99.301587)"
+ x1="-15.395237"
+ y1="1.6637709"
+ x2="226.55714"
+ y2="103.30186" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3594"
+ id="linearGradient4015"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(-61.333338,0.40887451)"
+ x1="-15.395237"
+ y1="1.6637709"
+ x2="226.55714"
+ y2="103.30186" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3934"
+ id="linearGradient4017"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(-61.333338,33.528902)"
+ x1="-15.395237"
+ y1="1.6637709"
+ x2="226.55714"
+ y2="103.30186" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3940"
+ id="linearGradient4019"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(-61.333338,66.64888)"
+ x1="-15.395237"
+ y1="1.6637709"
+ x2="226.55714"
+ y2="103.30186" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3946"
+ id="linearGradient4021"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(-278.3365,99.301587)"
+ x1="-15.395237"
+ y1="1.6637709"
+ x2="226.55714"
+ y2="103.30186" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3594"
+ id="linearGradient4025"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(0,-32.711111)"
+ x1="-15.395237"
+ y1="1.6637709"
+ x2="226.55714"
+ y2="103.30186" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4069"
+ id="linearGradient4051"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(217.00317,132.88889)"
+ x1="-15.395237"
+ y1="1.6637709"
+ x2="226.55714"
+ y2="103.30186" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4075"
+ id="linearGradient4063"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(320.68571,166.24253)"
+ x1="-15.395237"
+ y1="1.6637709"
+ x2="226.55714"
+ y2="103.30186" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3594"
+ id="linearGradient4081"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(217.00317,0.40887451)"
+ x1="-15.395237"
+ y1="1.6637709"
+ x2="226.55714"
+ y2="103.30186" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="1.8596728"
+ inkscape:cx="345.0223"
+ inkscape:cy="122.08773"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer2"
+ showgrid="false"
+ inkscape:window-width="1680"
+ inkscape:window-height="975"
+ inkscape:window-x="0"
+ inkscape:window-y="24"
+ inkscape:window-maximized="1" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="couches"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(247.11814,-10.102128)">
+ <g
+ id="g4040">
+ <rect
+ ry="4.9650793"
+ style="fill:url(#linearGradient4081);fill-opacity:1;stroke:#000000;stroke-opacity:1"
+ y="43.983757"
+ x="256.13968"
+ height="28.914286"
+ width="150.12064"
+ id="rect2820" />
+ <text
+ id="text2816"
+ y="61.751446"
+ x="286.35526"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ xml:space="preserve"><tspan
+ style="font-size:12px"
+ y="61.751446"
+ x="286.35526"
+ id="tspan2818"
+ sodipodi:role="line">Wikitty Service</tspan></text>
+ </g>
+ <rect
+ ry="4.9650793"
+ style="fill:url(#linearGradient3911);fill-opacity:1;stroke:#000000;stroke-opacity:1"
+ y="77.103783"
+ x="256.13968"
+ height="28.914286"
+ width="150.12064"
+ id="rect3641" />
+ <text
+ id="text3637"
+ y="96.274796"
+ x="306.32693"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ xml:space="preserve"><tspan
+ style="font-size:12px"
+ y="96.274796"
+ x="306.32693"
+ sodipodi:role="line"
+ id="tspan3782">Sécurité</tspan></text>
+ <rect
+ id="rect3651"
+ width="150.12064"
+ height="28.914286"
+ x="256.13968"
+ y="110.22376"
+ style="fill:url(#linearGradient3918);fill-opacity:1;stroke:#000000;stroke-opacity:1"
+ ry="4.9650793" />
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ x="312.50272"
+ y="129.15454"
+ id="text3647"><tspan
+ sodipodi:role="line"
+ id="tspan3649"
+ x="312.50272"
+ y="129.15454"
+ style="font-size:12px">Cache</tspan></text>
+ <g
+ id="g3816"
+ transform="translate(217.00317,0.46728516)">
+ <rect
+ id="rect3661"
+ width="150.12064"
+ height="28.914286"
+ x="39.136509"
+ y="142.87646"
+ style="fill:url(#linearGradient3952);fill-opacity:1;stroke:#000000;stroke-opacity:1"
+ ry="4.9650793" />
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ x="79.682175"
+ y="160.64417"
+ id="text3657"><tspan
+ sodipodi:role="line"
+ id="tspan3659"
+ x="79.682175"
+ y="160.64417"
+ style="font-size:12px">Notification</tspan></text>
+ <rect
+ ry="4.9650793"
+ style="fill:url(#linearGradient4021);fill-opacity:1;stroke:#000000;stroke-opacity:1"
+ y="142.87646"
+ x="-239.2"
+ height="28.914286"
+ width="150.12064"
+ id="rect3993" />
+ <text
+ id="text3995"
+ y="160.64417"
+ x="-198.65433"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ xml:space="preserve"><tspan
+ style="font-size:12px"
+ y="160.64417"
+ x="-198.65433"
+ id="tspan3997"
+ sodipodi:role="line">Notification</tspan></text>
+ </g>
+ <rect
+ id="rect3828"
+ width="150.12064"
+ height="85.282539"
+ x="256.13968"
+ y="176.46378"
+ style="fill:url(#linearGradient4051);fill-opacity:1;stroke:#000000;stroke-opacity:1"
+ ry="4.9650793" />
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ x="296.59454"
+ y="194.23146"
+ id="text3830"><tspan
+ sodipodi:role="line"
+ id="tspan3832"
+ x="296.59454"
+ y="194.23146"
+ style="font-size:12px">Persistance</tspan></text>
+ <rect
+ ry="4.9650793"
+ style="fill:url(#linearGradient4015);fill-opacity:1;stroke:#000000;stroke-opacity:1"
+ y="43.983757"
+ x="-22.196829"
+ height="28.914286"
+ width="150.12064"
+ id="rect3975" />
+ <text
+ id="text3977"
+ y="61.751446"
+ x="8.0187464"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ xml:space="preserve"><tspan
+ style="font-size:12px"
+ y="61.751446"
+ x="8.0187464"
+ id="tspan3979"
+ sodipodi:role="line">Wikitty Service</tspan></text>
+ <rect
+ id="rect3981"
+ width="150.12064"
+ height="28.914286"
+ x="-22.196829"
+ y="77.103783"
+ style="fill:url(#linearGradient4017);fill-opacity:1;stroke:#000000;stroke-opacity:1"
+ ry="4.9650793" />
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ x="27.990425"
+ y="96.274796"
+ id="text3983"><tspan
+ id="tspan3985"
+ sodipodi:role="line"
+ x="27.990425"
+ y="96.274796"
+ style="font-size:12px">Sécurité</tspan></text>
+ <rect
+ ry="4.9650793"
+ style="fill:url(#linearGradient4019);fill-opacity:1;stroke:#000000;stroke-opacity:1"
+ y="110.22376"
+ x="-22.196829"
+ height="28.914286"
+ width="150.12064"
+ id="rect3987" />
+ <text
+ id="text3989"
+ y="129.15454"
+ x="34.166206"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ xml:space="preserve"><tspan
+ style="font-size:12px"
+ y="129.15454"
+ x="34.166206"
+ id="tspan3991"
+ sodipodi:role="line">Cache</tspan></text>
+ <g
+ transform="translate(-61.333338,165.6)"
+ id="g4007">
+ <rect
+ id="rect4009"
+ width="150.12064"
+ height="28.914286"
+ x="39.136509"
+ y="10.863771"
+ style="fill:url(#linearGradient4025);fill-opacity:1;stroke:#000000;stroke-opacity:1"
+ ry="4.9650793" />
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ x="69.352097"
+ y="28.63146"
+ id="text4011"><tspan
+ sodipodi:role="line"
+ id="tspan4013"
+ x="69.352097"
+ y="28.63146"
+ style="font-size:12px">Wikitty Service</tspan></text>
+ </g>
+ <path
+ style="fill:#ececec;stroke:#000000;stroke-opacity:1"
+ d="m 232.6875,49.15625 c -0.19234,-0.01054 -0.33803,0.03632 -0.4375,0.09375 -0.5357,0.309289 -0.88742,2.43629 -1.0625,5.09375 l -49.53125,0 c -2.26524,0 -4.09375,1.828505 -4.09375,4.09375 0,0.05295 0.0293,0.103831 0.0312,0.15625 -0.002,0.05469 -0.0312,0.100967 -0.0312,0.15625 l 0,127.65625 -38.375,0 c -1.87039,0 -3.375,1.50461 -3.375,3.375 l 0,1.40625 c 0,1.87039 1.50461,3.375 3.375,3.375 l 43.1875,0 c 1.87039,0 3.375,-1.50461 3.375,-3.375 l 0,-1.28125 0,-0.125 0,-127.28125 45.4375,0 c 0.17485,2.662148 0.52614,4.81533 1.0625,5.125 1.59155,0.91888 15.90625,-7.349739 15.90625,-9.1875 0,-1.722901 -12.58368,-9.123093 -15.46875,-9.28125 z"
+ id="rect4027" />
+ <path
+ d="m 488.03811,153.09869 c 0,4.51647 -11.89928,8.17778 -26.57778,8.17778 -14.6785,0 -26.57778,-3.66131 -26.57778,-8.17778 0,-4.51646 11.89928,-8.17777 26.57778,-8.17777 14.6785,0 26.57778,3.66131 26.57778,8.17777 z"
+ sodipodi:ry="8.1777782"
+ sodipodi:rx="26.577778"
+ sodipodi:cy="153.09869"
+ sodipodi:cx="461.46033"
+ id="path4059"
+ style="fill:#ececec;stroke:#000000;stroke-opacity:1"
+ sodipodi:type="arc"
+ transform="translate(-169.39683,91.707937)" />
+ <path
+ transform="translate(-169.39683,82.751288)"
+ sodipodi:type="arc"
+ style="fill:#ececec;stroke:#000000;stroke-opacity:1"
+ id="path4057"
+ sodipodi:cx="461.46033"
+ sodipodi:cy="153.09869"
+ sodipodi:rx="26.577778"
+ sodipodi:ry="8.1777782"
+ d="m 488.03811,153.09869 c 0,4.51647 -11.89928,8.17778 -26.57778,8.17778 -14.6785,0 -26.57778,-3.66131 -26.57778,-8.17778 0,-4.51646 11.89928,-8.17777 26.57778,-8.17777 14.6785,0 26.57778,3.66131 26.57778,8.17777 z" />
+ <path
+ d="m 488.03811,153.09869 c 0,4.51647 -11.89928,8.17778 -26.57778,8.17778 -14.6785,0 -26.57778,-3.66131 -26.57778,-8.17778 0,-4.51646 11.89928,-8.17777 26.57778,-8.17777 14.6785,0 26.57778,3.66131 26.57778,8.17777 z"
+ sodipodi:ry="8.1777782"
+ sodipodi:rx="26.577778"
+ sodipodi:cy="153.09869"
+ sodipodi:cx="461.46033"
+ id="path4055"
+ style="fill:#ececec;stroke:#000000;stroke-opacity:1"
+ sodipodi:type="arc"
+ transform="translate(-169.39683,73.794682)" />
+ <path
+ sodipodi:type="arc"
+ style="fill:#ececec;stroke:#000000;stroke-opacity:1"
+ id="path4053"
+ sodipodi:cx="461.46033"
+ sodipodi:cy="153.09869"
+ sodipodi:rx="26.577778"
+ sodipodi:ry="8.1777782"
+ d="m 488.03811,153.09869 c 0,4.51647 -11.89928,8.17778 -26.57778,8.17778 -14.6785,0 -26.57778,-3.66131 -26.57778,-8.17778 0,-4.51646 11.89928,-8.17777 26.57778,-8.17777 14.6785,0 26.57778,3.66131 26.57778,8.17777 z"
+ transform="translate(-169.39683,64.838095)" />
+ <rect
+ ry="4.9650793"
+ style="fill:url(#linearGradient4063);fill-opacity:1;stroke:#000000;stroke-opacity:1"
+ y="209.81741"
+ x="327.11108"
+ height="28.914286"
+ width="71.555511"
+ id="rect4061" />
+ <text
+ id="text4065"
+ y="227.81876"
+ x="331.11639"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ xml:space="preserve"><tspan
+ style="font-size:12px"
+ y="227.81876"
+ x="331.11639"
+ id="tspan4067"
+ sodipodi:role="line">Indexation</tspan></text>
+ <g
+ id="g4109"
+ transform="translate(30.372791,-27.900587)">
+ <path
+ id="path4083"
+ d="m -225.58468,46.471515 c -16.68438,0 -30.61989,6.194421 -34,14.46875 -10.46987,4.690678 -17.40625,12.80906 -17.40625,22.0625 0,8.071994 5.29836,15.298526 13.59375,20.124995 -0.002,0.01 0.002,0.0213 0,0.0312 -0.10912,0.62925 -0.15625,1.2914 -0.15625,1.9375 0,10.33773 14.31659,18.71875 31.96875,18.71875 10.44893,0 19.69924,-2.95942 25.53125,-7.5 4.3808,1.38215 9.47106,2.1875 14.90625,2.1875 15.83384,0 28.77358,-6.72597 29.625,-15.1875 18.38337,-0.0827 33.21875,-7.329033 33.21875,-16.249995 0,-5.619342 -5.88789,-10.551604 -14.84375,-13.46875 0.003,-0.103705 0.0312,-0.208457 0.0312,-0.3125 0,-12.288245 -20.01349,-22.25 -44.6875,-22.25 -4.47883,0 -8.79573,0.357956 -12.875,0.96875 -6.31832,-3.421172 -15.14045,-5.53125 -24.90625,-5.53125 z"
+ style="fill:#e3dbdb;stroke:#000000;stroke-opacity:1" />
+ <text
+ id="text4100"
+ y="76.368225"
+ x="-209.19235"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#483737;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ xml:space="preserve"><tspan
+ style="font-size:12px;font-weight:bold;text-align:center;text-anchor:middle;fill:#483737;-inkscape-font-specification:Bitstream Charter Bold"
+ y="76.368225"
+ x="-209.19235"
+ id="tspan4102"
+ sodipodi:role="line">Application</tspan><tspan
+ id="tspan4104"
+ style="font-size:12px;font-weight:bold;text-align:center;text-anchor:middle;fill:#483737;-inkscape-font-specification:Bitstream Charter Bold"
+ y="91.368225"
+ x="-209.19235"
+ sodipodi:role="line">Utilisateur</tspan></text>
+ </g>
+ <path
+ style="fill:#ececec;stroke:#000000;stroke-opacity:1"
+ d="m -24.59375,5.6875 c -0.0729,0.017576 -0.106515,0.065035 -0.15625,0.09375 -0.5357,0.309289 -0.88742,2.43629 -1.0625,5.09375 l -38.8125,0 0,8.15625 38.8125,0 c 0.17485,2.662148 0.52614,4.81533 1.0625,5.125 1.59155,0.91888 15.90625,-7.349739 15.90625,-9.1875 0,-1.722901 -12.58368,-9.123093 -15.46875,-9.28125 -0.09617,-0.00527 -0.208351,-0.017576 -0.28125,0 z"
+ transform="translate(-22.696829,43.483757)"
+ id="path4106" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer2"
+ inkscape:label="technos"
+ style="display:inline"
+ transform="translate(-1e-6,7.96875)">
+ <path
+ style="fill:#ffffff;stroke:#999999;stroke-opacity:1"
+ d="m 179.59375,126.9375 c -16.33387,0 -29.5625,6.87983 -29.5625,15.34375 0,8.46392 13.22863,15.3125 29.5625,15.3125 14.73964,0 26.97351,-5.56469 29.21875,-12.875 l 19.71875,-5.40625 -19.90625,0 c -2.66028,-7.04819 -14.65054,-12.375 -29.03125,-12.375 z"
+ id="path4123" />
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ x="160.79045"
+ y="144.94669"
+ id="text4119"><tspan
+ sodipodi:role="line"
+ id="tspan4121"
+ x="160.79045"
+ y="144.94669"
+ style="font-size:10px;fill:#666666">JGroups</tspan></text>
+ <path
+ style="fill:#ffffff;stroke:#999999;stroke-opacity:1"
+ d="m 457.625,187.71875 c -14.9527,0 -27.32896,5.75306 -29.3125,13.21875 -2.64058,-4.1889 -7.79772,-7.03125 -13.71875,-7.03125 -8.61241,0 -15.59375,6.01301 -15.59375,13.4375 0,7.06948 6.33458,12.83747 14.375,13.375 -2.87507,2.10833 -4.5,4.52399 -4.5,7.0625 0,8.46392 18.03904,15.3125 40.3125,15.3125 22.27346,0 40.34375,-6.84858 40.34375,-15.3125 0,-4.8782 -6.02863,-9.22455 -15.375,-12.03125 5.49509,-1.9237 9.66863,-4.77201 11.6875,-8.125 l 22.84375,0 -21.5625,-3.6875 c 0.0348,-0.30491 0.0625,-0.59687 0.0625,-0.90625 0,-8.46392 -13.22863,-15.3125 -29.5625,-15.3125 z m -27.53125,20.9375 c 1.32768,1.74748 3.28859,3.32236 5.6875,4.6875 -2.92858,0.39347 -5.70756,0.90484 -8.28125,1.53125 1.42887,-1.81064 2.33543,-3.92161 2.59375,-6.21875 z"
+ id="path4125" />
+ <text
+ id="text4127"
+ y="211.05193"
+ x="407.65793"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ xml:space="preserve"><tspan
+ style="font-size:10px;fill:#666666"
+ y="211.05193"
+ x="407.65793"
+ id="tspan4129"
+ sodipodi:role="line">H2</tspan></text>
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ x="420.15561"
+ y="230.44559"
+ id="text4133"><tspan
+ sodipodi:role="line"
+ id="tspan4135"
+ x="420.15561"
+ y="230.44559"
+ style="font-size:10px;fill:#666666">PostgreSQL</tspan></text>
+ <text
+ id="text4139"
+ y="206.61336"
+ x="441.44528"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ xml:space="preserve"><tspan
+ style="font-size:10px;fill:#666666"
+ y="206.61336"
+ x="441.44528"
+ id="tspan4141"
+ sodipodi:role="line">HBase</tspan></text>
+ <path
+ style="fill:#ffffff;stroke:#999999;stroke-opacity:1"
+ d="m 691.53125,199 c -10.18105,0 -18.74639,3.28902 -21.28125,7.75 l -27.125,-2.90625 26.46875,6.71875 c 1.12902,5.28749 10.52235,9.40625 21.9375,9.40625 12.17616,0 22.03125,-4.67765 22.03125,-10.46875 0,-5.7911 -9.85509,-10.5 -22.03125,-10.5 z"
+ id="path4143" />
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ x="680.24261"
+ y="213.21994"
+ id="text4145"><tspan
+ sodipodi:role="line"
+ id="tspan4147"
+ x="680.24261"
+ y="213.21994"
+ style="font-size:10px;fill:#666666">SolR</tspan></text>
+ <path
+ style="fill:#ffffff;stroke:#999999;stroke-opacity:1"
+ d="m 418.90625,-7.46875 c -16.33387,0 -29.59375,6.84858357 -29.59375,15.3125 0,8.463916 13.25988,15.3125 29.59375,15.3125 0.54232,0 1.05862,-0.01631 1.59375,-0.03125 l 10.75,17.25 -4.625,-17.78125 c 12.57449,-1.764711 21.84375,-7.675786 21.84375,-14.75 0,-8.46391643 -13.22863,-15.3125 -29.5625,-15.3125 z"
+ id="path4157" />
+ <text
+ id="text4159"
+ y="10.514438"
+ x="400.07986"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ xml:space="preserve"><tspan
+ style="font-size:10px;fill:#666666"
+ y="10.514438"
+ x="400.07986"
+ id="tspan4161"
+ sodipodi:role="line">Hessian</tspan></text>
+ </g>
+</svg>
1
0
Author: bleny
Date: 2010-08-18 15:46:07 +0200 (Wed, 18 Aug 2010)
New Revision: 267
Url: http://nuiton.org/repositories/revision/wikitty/267
Log:
merging into branch changes done in trunk
Added:
branches/wikitty-eugene-migration/src/site/presentation_Wikitty_2010-08-20.odp
branches/wikitty-eugene-migration/wikitty-api/src/main/resources/META-INF/
branches/wikitty-eugene-migration/wikitty-api/src/main/resources/META-INF/hessian/
branches/wikitty-eugene-migration/wikitty-api/src/main/resources/META-INF/hessian/deserializers
branches/wikitty-eugene-migration/wikitty-api/src/main/resources/META-INF/hessian/serializers
branches/wikitty-eugene-migration/wikitty-hessian-server/src/test/java/HessianTest.java
Removed:
branches/wikitty-eugene-migration/wikitty-api/src/main/resources/META-INF/hessian/
branches/wikitty-eugene-migration/wikitty-api/src/main/resources/META-INF/hessian/deserializers
branches/wikitty-eugene-migration/wikitty-api/src/main/resources/META-INF/hessian/serializers
Modified:
branches/wikitty-eugene-migration/
branches/wikitty-eugene-migration/pom.xml
branches/wikitty-eugene-migration/wikitty-api/pom.xml
branches/wikitty-eugene-migration/wikitty-api/src/main/java/org/nuiton/wikitty/BusinessEntityWikitty.java
branches/wikitty-eugene-migration/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyCache.java
branches/wikitty-eugene-migration/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java
branches/wikitty-eugene-migration/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceCached.java
branches/wikitty-eugene-migration/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java
branches/wikitty-eugene-migration/wikitty-api/src/main/java/org/nuiton/wikitty/search/Search.java
branches/wikitty-eugene-migration/wikitty-hbase-impl/
branches/wikitty-eugene-migration/wikitty-hbase-impl/pom.xml
branches/wikitty-eugene-migration/wikitty-hessian-server/pom.xml
branches/wikitty-eugene-migration/wikitty-jdbc-impl/pom.xml
branches/wikitty-eugene-migration/wikitty-jms-impl/
branches/wikitty-eugene-migration/wikitty-jms-impl/pom.xml
branches/wikitty-eugene-migration/wikitty-jpa-impl/
branches/wikitty-eugene-migration/wikitty-jpa-impl/pom.xml
branches/wikitty-eugene-migration/wikitty-multistorage-impl/pom.xml
branches/wikitty-eugene-migration/wikitty-solr-impl/pom.xml
branches/wikitty-eugene-migration/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/SolrSearchTest.java
branches/wikitty-eugene-migration/wikitty-ui-zk/pom.xml
Property changes on: branches/wikitty-eugene-migration
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/2.0-eugene2:164-179
+ /branches/2.0-eugene2:164-179
/trunk:239-266
Modified: branches/wikitty-eugene-migration/pom.xml
===================================================================
--- branches/wikitty-eugene-migration/pom.xml 2010-08-17 16:19:53 UTC (rev 266)
+++ branches/wikitty-eugene-migration/pom.xml 2010-08-18 13:46:07 UTC (rev 267)
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -104,7 +106,7 @@
<dependency>
<groupId>com.caucho</groupId>
<artifactId>hessian</artifactId>
- <version>3.1.5</version>
+ <version>4.0.6</version>
<scope>compile</scope>
</dependency>
@@ -113,7 +115,7 @@
<artifactId>solr-core</artifactId>
<version>1.4.1</version>
</dependency>
-
+
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
@@ -192,7 +194,129 @@
<version>${zk.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase</artifactId>
+ <version>${hbase.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase</artifactId>
+ <classifier>tests</classifier>
+ <version>${hbase.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <!-- needed at runtime for tests -->
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-test</artifactId>
+ <version>0.20.3-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ <version>1.1</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <version>${jetty.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ <version>${spring.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>${spring.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-aop</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>${spring.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-orm</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-jdbc</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-entitymanager</artifactId>
+ <version>3.5.1-Final</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-validator</artifactId>
+ <version>4.0.2.GA</version>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ <version>2.2.0.GA</version>
+ </dependency>
+ <dependency>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ <version>1.6.1</version>
+ </dependency>
+ <dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <version>3.6.0.GA</version>
+ </dependency>
+ <dependency>
+ <groupId>antlr</groupId>
+ <artifactId>antlr</artifactId>
+ <version>2.7.7</version>
+ </dependency>
+ <dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib</artifactId>
+ <version>2.1_3</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hibernate.javax.persistence</groupId>
+ <artifactId>hibernate-jpa-2.0-api</artifactId>
+ <version>1.0.0.Final</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-core</artifactId>
+ <version>5.3.1</version>
+ </dependency>
+
</dependencies>
</dependencyManagement>
@@ -200,7 +324,8 @@
<!-- Source control management. -->
<scm>
<connection>scm:svn:http://svn.nuiton.org/svn/wikitty/trunk</connection>
- <developerConnection>scm:svn:http://svn.nuiton.org/svn/wikitty/trunk</developerConnection>
+ <developerConnection>scm:svn:http://svn.nuiton.org/svn/wikitty/trunk
+ </developerConnection>
<url>http://www.nuiton.org/repositories/browse/wikitty/trunk</url>
</scm>
@@ -228,6 +353,8 @@
<jetty.version>6.1.22</jetty.version>
<zk.version>5.0.2</zk.version>
+
+ <hbase.version>0.89.0-SNAPSHOT</hbase.version>
</properties>
<!-- ************************************************************* -->
@@ -262,7 +389,7 @@
<profiles>
<profile>
- <id>extra-modules</id>
+ <id>wikitty-extra-modules</id>
<modules>
<module>wikitty-hbase-impl</module>
<module>wikitty-jpa-impl</module>
@@ -271,5 +398,5 @@
</modules>
</profile>
</profiles>
-
+
</project>
Copied: branches/wikitty-eugene-migration/src/site/presentation_Wikitty_2010-08-20.odp (from rev 266, trunk/src/site/presentation_Wikitty_2010-08-20.odp)
===================================================================
(Binary files differ)
Modified: branches/wikitty-eugene-migration/wikitty-api/pom.xml
===================================================================
--- branches/wikitty-eugene-migration/wikitty-api/pom.xml 2010-08-17 16:19:53 UTC (rev 266)
+++ branches/wikitty-eugene-migration/wikitty-api/pom.xml 2010-08-18 13:46:07 UTC (rev 267)
@@ -25,21 +25,18 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
- <version>${spring.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
- <version>${spring.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
- <version>${spring.version}</version>
<scope>test</scope>
</dependency>
@@ -111,12 +108,6 @@
<!-- *** Build Settings ****************************************** -->
<!-- ************************************************************* -->
- <packaging>jar</packaging>
-
- <properties>
-
- </properties>
-
<build>
<pluginManagement>
@@ -200,8 +191,4 @@
</build>
- <!-- ************************************************************* -->
- <!-- *** Build Environment ************************************** -->
- <!-- ************************************************************* -->
-
</project>
Modified: branches/wikitty-eugene-migration/wikitty-api/src/main/java/org/nuiton/wikitty/BusinessEntityWikitty.java
===================================================================
--- branches/wikitty-eugene-migration/wikitty-api/src/main/java/org/nuiton/wikitty/BusinessEntityWikitty.java 2010-08-17 16:19:53 UTC (rev 266)
+++ branches/wikitty-eugene-migration/wikitty-api/src/main/java/org/nuiton/wikitty/BusinessEntityWikitty.java 2010-08-18 13:46:07 UTC (rev 267)
@@ -116,9 +116,26 @@
return Collections.emptyList();
}
+ @Override
+ public boolean equals(Object obj) {
+ if (obj == null) {
+ return false;
+ }
+ if (!BusinessEntityWikitty.class.isAssignableFrom(obj.getClass())) {
+ return false;
+ }
+ BusinessEntityWikitty wikitty = (BusinessEntityWikitty) obj;
+ return getWikittyId().equals(wikitty.getWikittyId());
+ }
+
+ @Override
+ public int hashCode() {
+ return getWikittyId().hashCode();
+ }
+
/*
- * @see org.nuiton.wikitty.BusinessEntity#addPropertyChangeListener(java.beans.PropertyChangeListener)
- */
+ * @see org.nuiton.wikitty.BusinessEntity#addPropertyChangeListener(java.beans.PropertyChangeListener)
+ */
@Override
public void addPropertyChangeListener(PropertyChangeListener listener) {
getPropertyChangeSupport().addPropertyChangeListener(listener);
Modified: branches/wikitty-eugene-migration/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyCache.java
===================================================================
--- branches/wikitty-eugene-migration/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyCache.java 2010-08-17 16:19:53 UTC (rev 266)
+++ branches/wikitty-eugene-migration/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyCache.java 2010-08-18 13:46:07 UTC (rev 267)
@@ -87,6 +87,9 @@
* @param e
*/
public void putWikitty(Wikitty e) {
+ if (e == null) {
+ return;
+ }
Wikitty old = getWikitty(e.getId());
if (old == null
|| WikittyUtil.versionGreaterThan(e.getVersion(), old.getVersion())) {
Modified: branches/wikitty-eugene-migration/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java
===================================================================
--- branches/wikitty-eugene-migration/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java 2010-08-17 16:19:53 UTC (rev 266)
+++ branches/wikitty-eugene-migration/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java 2010-08-18 13:46:07 UTC (rev 267)
@@ -151,6 +151,17 @@
/**
* Restore wikitty entity with specified id or {@code null} if entity can't be found.
*
+ * @param id entity id
+ * @return wikitty entity with specified id or {@code null} if entity can't be found
+ */
+ public Wikitty restore(String id) {
+ Wikitty wikitty = wikittyService.restore(securityToken, id);
+ return wikitty;
+ }
+
+ /**
+ * Restore wikitty entity with specified id or {@code null} if entity can't be found.
+ *
* @param <E> object type
* @param clazz entity class
* @param id entity id
Modified: branches/wikitty-eugene-migration/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceCached.java
===================================================================
--- branches/wikitty-eugene-migration/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceCached.java 2010-08-17 16:19:53 UTC (rev 266)
+++ branches/wikitty-eugene-migration/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceCached.java 2010-08-18 13:46:07 UTC (rev 267)
@@ -101,6 +101,12 @@
/** wrap the wikitty or copy it according to allwaysRestoreCopies value */
protected Wikitty wrapWikitty(Wikitty wikitty) {
+
+ // Restored wikitty can be null
+ if (wikitty == null) {
+ return null;
+ }
+
Wikitty result = null;
if (allwaysRestoreCopies) {
try {
@@ -366,8 +372,10 @@
cache.putAllWikitty(missingInCache);
for (Wikitty w : missingInCache) {
- // add missing object
- fromCache.put(w.getId(), w);
+ if (w != null) {
+ // add missing object
+ fromCache.put(w.getId(), w);
+ }
}
Collection<Wikitty> tmp = fromCache.values();
Modified: branches/wikitty-eugene-migration/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java
===================================================================
--- branches/wikitty-eugene-migration/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java 2010-08-17 16:19:53 UTC (rev 266)
+++ branches/wikitty-eugene-migration/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java 2010-08-18 13:46:07 UTC (rev 267)
@@ -52,7 +52,7 @@
public static final String DEFAULT_VERSION = "0.0";
- public static final String DATE_FORMAT = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'Z";
+ public static final String DATE_FORMAT = "yyyy-MM-dd'T'HH:mm:ss.SSSZ'Z'";
public static final String[] DATE_FORMAT_ALLOWED = {
DATE_FORMAT,
new SimpleDateFormat().toPattern(),
Modified: branches/wikitty-eugene-migration/wikitty-api/src/main/java/org/nuiton/wikitty/search/Search.java
===================================================================
--- branches/wikitty-eugene-migration/wikitty-api/src/main/java/org/nuiton/wikitty/search/Search.java 2010-08-17 16:19:53 UTC (rev 266)
+++ branches/wikitty-eugene-migration/wikitty-api/src/main/java/org/nuiton/wikitty/search/Search.java 2010-08-18 13:46:07 UTC (rev 267)
@@ -128,6 +128,19 @@
}
/**
+ * Contains.
+ *
+ * @param element
+ * @param value
+ * @return
+ */
+ public Search contains(String element, String value) {
+ restrictions.add(RestrictionHelper.contains(elt(element),
+ value));
+ return this;
+ }
+
+ /**
* Equals.
*
* @param element
Deleted: branches/wikitty-eugene-migration/wikitty-api/src/main/resources/META-INF/hessian/deserializers
===================================================================
--- trunk/wikitty-api/src/main/resources/META-INF/hessian/deserializers 2010-08-17 16:19:53 UTC (rev 266)
+++ branches/wikitty-eugene-migration/wikitty-api/src/main/resources/META-INF/hessian/deserializers 2010-08-18 13:46:07 UTC (rev 267)
@@ -1 +0,0 @@
-java.math.BigDecimal=com.caucho.hessian.io.BigDecimalDeserializer
\ No newline at end of file
Copied: branches/wikitty-eugene-migration/wikitty-api/src/main/resources/META-INF/hessian/deserializers (from rev 266, trunk/wikitty-api/src/main/resources/META-INF/hessian/deserializers)
===================================================================
--- branches/wikitty-eugene-migration/wikitty-api/src/main/resources/META-INF/hessian/deserializers (rev 0)
+++ branches/wikitty-eugene-migration/wikitty-api/src/main/resources/META-INF/hessian/deserializers 2010-08-18 13:46:07 UTC (rev 267)
@@ -0,0 +1 @@
+java.math.BigDecimal=com.caucho.hessian.io.BigDecimalDeserializer
\ No newline at end of file
Deleted: branches/wikitty-eugene-migration/wikitty-api/src/main/resources/META-INF/hessian/serializers
===================================================================
--- trunk/wikitty-api/src/main/resources/META-INF/hessian/serializers 2010-08-17 16:19:53 UTC (rev 266)
+++ branches/wikitty-eugene-migration/wikitty-api/src/main/resources/META-INF/hessian/serializers 2010-08-18 13:46:07 UTC (rev 267)
@@ -1 +0,0 @@
-java.math.BigDecimal=com.caucho.hessian.io.StringValueSerializer
\ No newline at end of file
Copied: branches/wikitty-eugene-migration/wikitty-api/src/main/resources/META-INF/hessian/serializers (from rev 266, trunk/wikitty-api/src/main/resources/META-INF/hessian/serializers)
===================================================================
--- branches/wikitty-eugene-migration/wikitty-api/src/main/resources/META-INF/hessian/serializers (rev 0)
+++ branches/wikitty-eugene-migration/wikitty-api/src/main/resources/META-INF/hessian/serializers 2010-08-18 13:46:07 UTC (rev 267)
@@ -0,0 +1 @@
+java.math.BigDecimal=com.caucho.hessian.io.StringValueSerializer
\ No newline at end of file
Property changes on: branches/wikitty-eugene-migration/wikitty-hbase-impl
___________________________________________________________________
Modified: svn:ignore
- .settings
target
.classpath
.project
build
PutObjectStoreDirHere
+ .settings
target
.classpath
.project
build
PutObjectStoreDirHere
*.ipr
*.iml
*.iws
Modified: branches/wikitty-eugene-migration/wikitty-hbase-impl/pom.xml
===================================================================
--- branches/wikitty-eugene-migration/wikitty-hbase-impl/pom.xml 2010-08-17 16:19:53 UTC (rev 266)
+++ branches/wikitty-eugene-migration/wikitty-hbase-impl/pom.xml 2010-08-18 13:46:07 UTC (rev 267)
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -17,69 +18,70 @@
<artifactId>wikitty-hbase-impl</artifactId>
<dependencies>
- <!-- TEST -->
+
+ <!-- sibling depedencies -->
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>wikitty-api</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
</dependency>
+
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>wikitty-solr-impl</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>wikitty-api</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
+
<dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
- <version>${spring.version}</version>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
- <version>${spring.version}</version>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
- <version>${spring.version}</version>
<scope>test</scope>
</dependency>
- <!-- COMPILE -->
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>wikitty-api</artifactId>
- <version>${project.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>wikitty-solr-impl</artifactId>
- <version>${project.version}</version>
- <scope>compile</scope>
- </dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
- <version>${jetty.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>xpp3</groupId>
<artifactId>xpp3</artifactId>
- <version>1.1.4c</version>
</dependency>
- <!-- HBASE -->
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>
+
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
@@ -113,29 +115,28 @@
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase</artifactId>
- <version>0.89.0-SNAPSHOT</version>
</dependency>
+
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase</artifactId>
- <version>0.89.0-SNAPSHOT</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
+
<dependency>
<!-- needed at runtime for tests -->
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-test</artifactId>
- <version>0.20.3-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
- <version>1.1</version>
<scope>test</scope>
</dependency>
+
</dependencies>
<!-- ************************************************************* -->
@@ -154,8 +155,10 @@
<packaging>jar</packaging>
<properties>
- <!-- Test don't run in hudson due to port restriction -->
- <maven.test.skip>false</maven.test.skip>
+ <!-- FIXME tchemit 20010-08-12 : Find a nice way to do it in test :
+ Must brefore test to detect if test can be executed otherwise ignore it
+ -->
+ <maven.test.failure.ignore>true</maven.test.failure.ignore>
</properties>
<!-- ************************************************************* -->
@@ -179,5 +182,21 @@
</plugins>
</build>
+ <!-- FIXME tchemit 2010-08-12 Must be removed as soon as a stable version is available -->
+ <repositories>
+ <repository>
+ <id>apache-snapshots</id>
+ <url>
+ http://nexus.nuiton.org/nexus/content/repositories/apache-snapshots/
+ </url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </repository>
+ </repositories>
+
</project>
Modified: branches/wikitty-eugene-migration/wikitty-hessian-server/pom.xml
===================================================================
--- branches/wikitty-eugene-migration/wikitty-hessian-server/pom.xml 2010-08-17 16:19:53 UTC (rev 266)
+++ branches/wikitty-eugene-migration/wikitty-hessian-server/pom.xml 2010-08-18 13:46:07 UTC (rev 267)
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -16,46 +18,47 @@
<artifactId>wikitty-hessian-server</artifactId>
<dependencies>
+
+ <!-- sibling dependencies -->
+
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>wikitty-api</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
-
- <!-- webapp can manage every things -->
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>wikitty-jdbc-impl</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
- <!--dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>wikitty-multistorage-impl</artifactId>
- <version>${project.version}</version>
- <scope>compile</scope>
- </dependency-->
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>wikitty-solr-impl</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
+
<dependency>
<groupId>com.caucho</groupId>
<artifactId>hessian</artifactId>
</dependency>
<dependency>
- <groupId>com.h2database</groupId>
- <artifactId>h2</artifactId>
- <scope>runtime</scope>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ <scope>runtime</scope>
</dependency>
<dependency>
- <groupId>postgresql</groupId>
- <artifactId>postgresql</artifactId>
- <scope>runtime</scope>
+ <groupId>postgresql</groupId>
+ <artifactId>postgresql</artifactId>
+ <scope>runtime</scope>
</dependency>
+ <!-- TEST -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
</dependencies>
<!-- ************************************************************* -->
@@ -67,4 +70,38 @@
<description>Wikitty hessian server</description>
<inceptionYear>2010</inceptionYear>
+
+ <profiles>
+ <!-- use this profile to add all impl dependencies -->
+ <profile>
+ <id>wikitty-extra-modules</id>
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>wikitty-hbase-impl</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>wikitty-jpa-impl</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>wikitty-jms-impl</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>wikitty-multistorage-impl</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
Copied: branches/wikitty-eugene-migration/wikitty-hessian-server/src/test/java/HessianTest.java (from rev 266, trunk/wikitty-hessian-server/src/test/java/HessianTest.java)
===================================================================
--- branches/wikitty-eugene-migration/wikitty-hessian-server/src/test/java/HessianTest.java (rev 0)
+++ branches/wikitty-eugene-migration/wikitty-hessian-server/src/test/java/HessianTest.java 2010-08-18 13:46:07 UTC (rev 267)
@@ -0,0 +1,34 @@
+import com.caucho.hessian.io.Hessian2Input;
+import com.caucho.hessian.io.Hessian2Output;
+import com.caucho.hessian.io.SerializerFactory;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.math.BigDecimal;
+
+/**
+ * @author sletellier <letellier(a)codelutin.com>
+ */
+public class HessianTest {
+
+ @Test
+ public void testHessianBigDecimal() throws Exception {
+ BigDecimal object = new BigDecimal("12474639.945458954");
+ Hessian2Output os = new Hessian2Output(null);
+ SerializerFactory factory = new SerializerFactory();
+ os.setSerializerFactory(factory);
+ ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+ os.init(buffer);
+ os.writeObject(object);
+ os.close();
+ byte[] bytes = buffer.toByteArray();
+
+ Hessian2Input is = new Hessian2Input(new ByteArrayInputStream(bytes));
+ BigDecimal newObject = (BigDecimal) is.readObject();
+ is.close();
+
+ Assert.assertEquals(object, newObject);
+ }
+}
Modified: branches/wikitty-eugene-migration/wikitty-jdbc-impl/pom.xml
===================================================================
--- branches/wikitty-eugene-migration/wikitty-jdbc-impl/pom.xml 2010-08-17 16:19:53 UTC (rev 266)
+++ branches/wikitty-eugene-migration/wikitty-jdbc-impl/pom.xml 2010-08-18 13:46:07 UTC (rev 267)
@@ -13,7 +13,29 @@
<artifactId>wikitty-jdbc-impl</artifactId>
<dependencies>
+
+ <!-- sibling dependencies -->
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>wikitty-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>wikitty-solr-impl</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>wikitty-api</artifactId>
+ <version>${project.version}</version>
+ <classifier>tests</classifier>
+ <scope>test</scope>
+ </dependency>
+
<!-- TEST -->
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -21,45 +43,22 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
- <version>${spring.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
- <version>${spring.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
- <version>${spring.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>wikitty-api</artifactId>
- <version>${project.version}</version>
- <classifier>tests</classifier>
- <scope>test</scope>
- </dependency>
- <!-- WIKITTY -->
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>wikitty-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>wikitty-solr-impl</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
- <version>${jetty.version}</version>
<scope>provided</scope>
</dependency>
Property changes on: branches/wikitty-eugene-migration/wikitty-jms-impl
___________________________________________________________________
Modified: svn:ignore
- .settings
target
.classpath
.project
PutObjectStoreDirHere
+ .settings
target
.classpath
.project
PutObjectStoreDirHere
*.ipr
*.iws
*.iml
Modified: branches/wikitty-eugene-migration/wikitty-jms-impl/pom.xml
===================================================================
--- branches/wikitty-eugene-migration/wikitty-jms-impl/pom.xml 2010-08-17 16:19:53 UTC (rev 266)
+++ branches/wikitty-eugene-migration/wikitty-jms-impl/pom.xml 2010-08-18 13:46:07 UTC (rev 267)
@@ -1,59 +1,56 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.nuiton</groupId>
- <artifactId>wikitty</artifactId>
- <version>2.1-SNAPSHOT</version>
- </parent>
+ <parent>
+ <groupId>org.nuiton</groupId>
+ <artifactId>wikitty</artifactId>
+ <version>2.1-SNAPSHOT</version>
+ </parent>
- <groupId>org.nuiton.wikitty</groupId>
- <artifactId>wikitty-jms-impl</artifactId>
+ <groupId>org.nuiton.wikitty</groupId>
+ <artifactId>wikitty-jms-impl</artifactId>
- <dependencies>
- <!-- WIKITTY -->
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>wikitty-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>wikitty-solr-impl</artifactId>
- <version>${project.version}</version>
- </dependency>
+ <dependencies>
- <!-- JMS -->
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
- <version>5.3.1</version>
- </dependency>
+ <!-- sibling dependencies -->
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>wikitty-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>wikitty-solr-impl</artifactId>
+ <version>${project.version}</version>
+ </dependency>
- <!-- TEST -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
+ <!-- JMS -->
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-core</artifactId>
+ </dependency>
- </dependencies>
+ <!-- TEST -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
- <!-- ************************************************************* -->
- <!-- *** Project Information ************************************* -->
- <!-- ************************************************************* -->
+ </dependencies>
- <name>Wikitty :: wikitty-jms-impl</name>
+ <!-- ************************************************************* -->
+ <!-- *** Project Information ************************************* -->
+ <!-- ************************************************************* -->
- <description>jms storage implementation</description>
- <inceptionYear>2010</inceptionYear>
+ <name>Wikitty :: wikitty-jms-impl</name>
- <!-- ************************************************************* -->
- <!-- *** Build Settings ****************************************** -->
- <!-- ************************************************************* -->
+ <description>jms storage implementation</description>
+ <inceptionYear>2010</inceptionYear>
- <packaging>jar</packaging>
-
</project>
Property changes on: branches/wikitty-eugene-migration/wikitty-jpa-impl
___________________________________________________________________
Modified: svn:ignore
- .settings
target
.classpath
.project
PutObjectStoreDirHere
solr
+ .settings
target
.classpath
.project
PutObjectStoreDirHere
solr
*.ipr
*.iws
*.iml
Modified: branches/wikitty-eugene-migration/wikitty-jpa-impl/pom.xml
===================================================================
--- branches/wikitty-eugene-migration/wikitty-jpa-impl/pom.xml 2010-08-17 16:19:53 UTC (rev 266)
+++ branches/wikitty-eugene-migration/wikitty-jpa-impl/pom.xml 2010-08-18 13:46:07 UTC (rev 267)
@@ -1,175 +1,170 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.nuiton</groupId>
- <artifactId>wikitty</artifactId>
- <version>2.1-SNAPSHOT</version>
- </parent>
+ <parent>
+ <groupId>org.nuiton</groupId>
+ <artifactId>wikitty</artifactId>
+ <version>2.1-SNAPSHOT</version>
+ </parent>
- <!-- ************************************************************* -->
- <!-- *** POM Relationships *************************************** -->
- <!-- ************************************************************* -->
+ <!-- ************************************************************* -->
+ <!-- *** POM Relationships *************************************** -->
+ <!-- ************************************************************* -->
- <groupId>org.nuiton.wikitty</groupId>
- <artifactId>wikitty-jpa-impl</artifactId>
+ <groupId>org.nuiton.wikitty</groupId>
+ <artifactId>wikitty-jpa-impl</artifactId>
- <dependencies>
- <!-- TEST -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
+ <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>wikitty-api</artifactId>
- <version>${project.version}</version>
- <classifier>tests</classifier>
- <scope>test</scope>
- </dependency>
+ <!-- sibling dependencies -->
- <!-- LOG -->
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>wikitty-api</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
- <!-- SPRING -->
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-test</artifactId>
- <version>${spring.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-aop</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-orm</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-jdbc</artifactId>
- <version>${spring.version}</version>
- </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>wikitty-solr-impl</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
- <!-- COMPILE -->
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>wikitty-api</artifactId>
- <version>${project.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>wikitty-solr-impl</artifactId>
- <version>${project.version}</version>
- <scope>compile</scope>
- </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>wikitty-api</artifactId>
+ <version>${project.version}</version>
+ <classifier>tests</classifier>
+ <scope>test</scope>
+ </dependency>
- <!-- Hibernate -->
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-entitymanager</artifactId>
- <version>3.5.1-Final</version>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-validator</artifactId>
- <version>4.0.2.GA</version>
- </dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- <version>2.2.0.GA</version>
- </dependency>
- <dependency>
- <groupId>dom4j</groupId>
- <artifactId>dom4j</artifactId>
- <version>1.6.1</version>
- </dependency>
- <dependency>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- <version>3.6.0.GA</version>
- </dependency>
- <dependency>
- <groupId>antlr</groupId>
- <artifactId>antlr</artifactId>
- <version>2.7.7</version>
- </dependency>
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib</artifactId>
- <version>2.1_3</version>
- </dependency>
- <dependency>
- <groupId>com.experlog</groupId>
- <artifactId>xapool</artifactId>
- <version>1.5.0</version>
- </dependency>
- <dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- <version>1.1</version>
- </dependency>
- <dependency>
- <groupId>org.hibernate.javax.persistence</groupId>
- <artifactId>hibernate-jpa-2.0-api</artifactId>
- <version>1.0.0.Final</version>
- </dependency>
+ <!-- TEST -->
- <!-- H2 -->
- <dependency>
- <groupId>com.h2database</groupId>
- <artifactId>h2</artifactId>
- </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
- </dependencies>
+ <!-- LOG -->
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
- <!-- ************************************************************* -->
- <!-- *** Project Information ************************************* -->
- <!-- ************************************************************* -->
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
- <name>Wikitty :: wikitty-jpa-impl</name>
+ <!-- SPRING -->
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ <scope>test</scope>
+ </dependency>
- <description>jpa impl of wikitty</description>
- <inceptionYear>2009</inceptionYear>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-aop</artifactId>
+ <scope>test</scope>
+ </dependency>
- <!-- ************************************************************* -->
- <!-- *** Build Settings ****************************************** -->
- <!-- ************************************************************* -->
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <scope>compile</scope>
+ </dependency>
- <packaging>jar</packaging>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <scope>test</scope>
+ </dependency>
- <properties>
- <maven.test.failure.ignore>false</maven.test.failure.ignore>
- </properties>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-orm</artifactId>
+ <scope>compile</scope>
+ </dependency>
- <!-- ************************************************************* -->
- <!-- *** Build Environment ************************************** -->
- <!-- ************************************************************* -->
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-jdbc</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <!-- Hibernate -->
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-entitymanager</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-validator</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>antlr</groupId>
+ <artifactId>antlr</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.experlog</groupId>
+ <artifactId>xapool</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate.javax.persistence</groupId>
+ <artifactId>hibernate-jpa-2.0-api</artifactId>
+ </dependency>
+
+ <!-- H2 -->
+ <dependency>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ </dependency>
+
+ </dependencies>
+
+ <!-- ************************************************************* -->
+ <!-- *** Project Information ************************************* -->
+ <!-- ************************************************************* -->
+
+ <name>Wikitty :: wikitty-jpa-impl</name>
+ <description>jpa impl of wikitty</description>
+ <inceptionYear>2009</inceptionYear>
+
+ <!-- ************************************************************* -->
+ <!-- *** Build Settings ****************************************** -->
+ <!-- ************************************************************* -->
+
+ <properties>
+
+ <maven.test.failure.ignore>true</maven.test.failure.ignore>
+ </properties>
+
</project>
Modified: branches/wikitty-eugene-migration/wikitty-multistorage-impl/pom.xml
===================================================================
--- branches/wikitty-eugene-migration/wikitty-multistorage-impl/pom.xml 2010-08-17 16:19:53 UTC (rev 266)
+++ branches/wikitty-eugene-migration/wikitty-multistorage-impl/pom.xml 2010-08-18 13:46:07 UTC (rev 267)
@@ -14,28 +14,15 @@
<artifactId>wikitty-multistorage-impl</artifactId>
<dependencies>
- <!-- WIKITTY -->
+
+ <!-- sibling dependencies -->
+
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>wikitty-api</artifactId>
<version>${project.version}</version>
</dependency>
-
- <!-- TEST -->
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- <dependency>
- <groupId>com.h2database</groupId>
- <artifactId>h2</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </dependency>
-
- <dependency>
<groupId>${project.groupId}</groupId>
<artifactId>wikitty-jdbc-impl</artifactId>
<version>${project.version}</version>
@@ -53,6 +40,21 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+
+ <!-- TEST -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </dependency>
+
</dependencies>
<!-- ************************************************************* -->
@@ -67,12 +69,10 @@
<!-- *** Build Settings ****************************************** -->
<!-- ************************************************************* -->
- <packaging>jar</packaging>
-
<properties>
- <!-- maven conventionnal variables doesn't work ?
- <maven.test.failure.ignore>true</maven.test.failure.ignore> -->
- <maven.test.testFailureIgnore>true</maven.test.testFailureIgnore>
+ <!-- maven conventionnal variables doesn't work ? -->
+ <maven.test.failure.ignore>true</maven.test.failure.ignore>
+ <!--maven.test.testFailureIgnore>true</maven.test.testFailureIgnore-->
</properties>
<build>
Modified: branches/wikitty-eugene-migration/wikitty-solr-impl/pom.xml
===================================================================
--- branches/wikitty-eugene-migration/wikitty-solr-impl/pom.xml 2010-08-17 16:19:53 UTC (rev 266)
+++ branches/wikitty-eugene-migration/wikitty-solr-impl/pom.xml 2010-08-18 13:46:07 UTC (rev 267)
@@ -17,13 +17,20 @@
<artifactId>wikitty-solr-impl</artifactId>
<dependencies>
- <!-- COMPILE -->
+
+ <!-- sibling dependencies -->
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>wikitty-api</artifactId>
<version>${project.version}</version>
- <scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>wikitty-api</artifactId>
+ <version>${project.version}</version>
+ <classifier>tests</classifier>
+ <scope>test</scope>
+ </dependency>
<!-- SOLR -->
<dependency>
@@ -56,28 +63,19 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
- <version>${spring.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
- <version>${spring.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
- <version>${spring.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>wikitty-api</artifactId>
- <version>${project.version}</version>
- <classifier>tests</classifier>
- <scope>test</scope>
- </dependency>
+
</dependencies>
<!-- ************************************************************* -->
Modified: branches/wikitty-eugene-migration/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/SolrSearchTest.java
===================================================================
--- branches/wikitty-eugene-migration/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/SolrSearchTest.java 2010-08-17 16:19:53 UTC (rev 266)
+++ branches/wikitty-eugene-migration/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/SolrSearchTest.java 2010-08-18 13:46:07 UTC (rev 267)
@@ -4,6 +4,8 @@
import static junit.framework.Assert.assertTrue;
import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
import java.util.List;
import org.apache.commons.logging.Log;
@@ -410,4 +412,31 @@
list = result.getAll();
assertEquals(0, list.size());
}
+
+ /** test that doing a search with a date criteria is possible */
+ @Test
+ public void testSearchByDate() throws Exception {
+ Calendar cal = Calendar.getInstance();
+ cal.set(Calendar.DAY_OF_MONTH, 20);
+ cal.set(Calendar.MONTH, 9);
+ cal.set(Calendar.YEAR, 2009);
+
+ // this must return a date in a format understandable for solr
+ // pattern in WikittyUtil has to be compatible
+ String dateString = WikittyUtil.formatDate(cal.getTime());
+
+ Criteria criteria = Search.query()
+ .gt("Test.buildDate", dateString)
+ .criteria()
+ .setFirstIndex(0).setEndIndex(Criteria.ALL_ELEMENTS);
+
+ // If an exception is thrown, check that the pattern in WikittyUtil
+ // is compatible with solr, in particular that the trailing Z
+ // is present and respect http://wiki.apache.org/solr/IndexingDates
+ PagedResult<String> result = ws.findAllByCriteria(null, criteria);
+
+
+ List<String> list = result.getAll();
+ assertEquals(1, list.size());
+ }
}
Modified: branches/wikitty-eugene-migration/wikitty-ui-zk/pom.xml
===================================================================
--- branches/wikitty-eugene-migration/wikitty-ui-zk/pom.xml 2010-08-17 16:19:53 UTC (rev 266)
+++ branches/wikitty-eugene-migration/wikitty-ui-zk/pom.xml 2010-08-18 13:46:07 UTC (rev 267)
@@ -17,12 +17,13 @@
<dependencies>
+ <!-- sibling dependencies -->
+
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>wikitty-api</artifactId>
<version>${project.version}</version>
</dependency>
-
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>wikitty-jdbc-impl</artifactId>
1
0
Author: bleny
Date: 2010-08-17 18:19:53 +0200 (Tue, 17 Aug 2010)
New Revision: 266
Url: http://nuiton.org/repositories/revision/wikitty/266
Log:
draft presentation wikitty
Added:
trunk/src/site/presentation_Wikitty_2010-08-20.odp
Added: trunk/src/site/presentation_Wikitty_2010-08-20.odp
===================================================================
(Binary files differ)
Property changes on: trunk/src/site/presentation_Wikitty_2010-08-20.odp
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
1
0
r265 - branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator
by bleny＠users.nuiton.org 16 Aug '10
by bleny＠users.nuiton.org 16 Aug '10
16 Aug '10
Author: bleny
Date: 2010-08-16 18:58:46 +0200 (Mon, 16 Aug 2010)
New Revision: 265
Url: http://nuiton.org/repositories/revision/wikitty/265
Log:
abstract delegate to helper ; all setters now return old value
Modified:
branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java
branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyContractGenerator.java
branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java
Modified: branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java
===================================================================
--- branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java 2010-08-16 16:12:57 UTC (rev 264)
+++ branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java 2010-08-16 16:58:46 UTC (rev 265)
@@ -59,12 +59,10 @@
}
for (ObjectModelClass businessEntity : model.getClasses()) {
-
- addImports(processedClasses.get(businessEntity));
-
- addConstructors(processedClasses.get(businessEntity));
-
- addConstants(businessEntity, processedClasses.get(businessEntity));
+ ObjectModelClass abstractClassForThisEntity = processedClasses.get(businessEntity);
+ addImports(abstractClassForThisEntity);
+ addConstructors(abstractClassForThisEntity);
+ addConstants(businessEntity, abstractClassForThisEntity);
}
processedClasses.clear();
@@ -228,6 +226,7 @@
protected void addOperations(ObjectModelClass businessEntity, ObjectModelClass abstractClass) {
String extensionVariableName = WikittyTransformerUtil.classToExtensionVariableName(businessEntity, true);
+ String helperClassName = businessEntity.getName() + "Helper";
// generating operations with bodies to realize contract
for (ObjectModelAttribute attribute : businessEntity.getAttributes()) {
@@ -255,9 +254,9 @@
addAnnotation(abstractClass, getter, "Override");
String getterBody = ""
/*{
- <%= attributeTypeSimpleNameInSet %> result = getWikitty().<%=getFieldMethodName%>(<%= extensionVariableName %>, <%= fieldVariableName %>, <%= attributeType %>.class);
+ <%=attributeTypeSimpleNameInSet%> result = <%=helperClassName%>.<%=getterName%>(getWikitty());
return result;
-}*/;
+}*/;
setOperationBody(getter, getterBody);
String addName = "add" + StringUtils.capitalize(attributeName);
@@ -266,7 +265,7 @@
addParameter(adder, "String", "element");
String adderBody = ""
/*{
- getWikitty().addToField(<%=extensionVariableName%>, <%=fieldVariableName%>, element);
+ <%=helperClassName%>.<%=addName%>(getWikitty(), element);
getPropertyChangeSupport().firePropertyChange(<%=fieldVariableName%>, null, <%= getter.getName() %>());
}*/;
setOperationBody(adder, adderBody);
@@ -277,7 +276,7 @@
addParameter(remover, "String", "element");
String removerBody = ""
/*{
- getWikitty().removeFromField(<%=extensionVariableName%>, <%=fieldVariableName%>, element);
+ <%=helperClassName%>.<%=removeName%>(getWikitty(), element);
getPropertyChangeSupport().firePropertyChange(<%=fieldVariableName%>, null, <%=getter.getName()%>());
}*/;
setOperationBody(remover, removerBody);
@@ -287,7 +286,7 @@
addAnnotation(abstractClass, clear, "Override");
String clearBody = ""
/*{
- getWikitty().clearField(<%=extensionVariableName%>, <%=fieldVariableName%>);
+ <%=helperClassName%>.<%=clearName%>(getWikitty());
getPropertyChangeSupport().firePropertyChange(<%=fieldVariableName%>, null, <%=getter.getName()%>());
}*/;
setOperationBody(clear, clearBody);
@@ -302,24 +301,23 @@
addAnnotation(abstractClass, getter, "Override");
setOperationBody(getter, ""
/*{
- <%=attributeType%> result = getWikitty().<%=getFieldMethodName%>(<%=extensionVariableName%>, <%=fieldVariableName%>);
- return result;
+ <%=attributeType%> value = <%=helperClassName%>.<%=getterName%>(getWikitty());
+ return value;
}*/);
String setterName = "set" + StringUtils.capitalize(attributeName);
- ObjectModelOperation setter = addOperation(abstractClass, setterName, "void");
+ ObjectModelOperation setter = addOperation(abstractClass, setterName, attributeType);
addAnnotation(abstractClass, setter, "Override");
addParameter(setter, attributeType, attributeName);
setOperationBody(setter, ""
/*{
- Object oldValue = getField(<%=extensionVariableName%>, <%=fieldVariableName%>);
- getWikitty().setField(<%=extensionVariableName%>, <%=fieldVariableName%>, <%=attributeName%>);
- getPropertyChangeSupport().firePropertyChange(<%=fieldVariableName%>, oldValue, <%=attributeName%>);
+ <%=attributeType%> oldValue = <%=helperClassName%>.<%=setterName%>(getWikitty(), <%=attributeName%>);
+ getPropertyChangeSupport().firePropertyChange(<%=fieldVariableName%>, oldValue, <%=getter.getName()%>());
+ return oldValue;
}*/);
}
}
}
-
}
protected void addInheritedOperations(ObjectModelClass businessEntity, ObjectModelClass abstractClass) {
Modified: branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyContractGenerator.java
===================================================================
--- branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyContractGenerator.java 2010-08-16 16:12:57 UTC (rev 264)
+++ branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyContractGenerator.java 2010-08-16 16:58:46 UTC (rev 265)
@@ -151,7 +151,7 @@
getter = addOperation(contract, getterName, attributeType);
String setterName = "set" + StringUtils.capitalize(attributeName);
- ObjectModelOperation setter = addOperation(contract, setterName, "void");
+ ObjectModelOperation setter = addOperation(contract, setterName, attributeType);
addParameter(setter, attributeType, attributeName);
}
Modified: branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java
===================================================================
--- branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java 2010-08-16 16:12:57 UTC (rev 264)
+++ branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java 2010-08-16 16:58:46 UTC (rev 265)
@@ -70,7 +70,7 @@
// now, for this attribute, we will generate add, remove and clear methods
// adding operations to contract
String getterName = "get" + StringUtils.capitalize(attributeName);
- ObjectModelOperation getter = addOperation(helper, getterName, attributeTypeSimpleNameInSet);
+ ObjectModelOperation getter = addOperation(helper, getterName, attributeTypeSimpleNameInSet, ObjectModelModifier.STATIC);
addParameter(getter, "Wikitty", "wikitty");
String getterBody = ""
/*{
@@ -80,7 +80,7 @@
setOperationBody(getter, getterBody);
String addName = "add" + StringUtils.capitalize(attributeName);
- ObjectModelOperation adder = addOperation(helper, addName, "void");
+ ObjectModelOperation adder = addOperation(helper, addName, "void", ObjectModelModifier.STATIC);
addParameter(adder, "Wikitty", "wikitty");
addParameter(adder, attributeType, "element");
String adderBody = ""
@@ -90,7 +90,7 @@
setOperationBody(adder, adderBody);
String removeName = "remove" + StringUtils.capitalize(attributeName);
- ObjectModelOperation remover = addOperation(helper, removeName, "void");
+ ObjectModelOperation remover = addOperation(helper, removeName, "void", ObjectModelModifier.STATIC);
addParameter(remover, "Wikitty", "wikitty");
addParameter(remover, attributeType, "element");
String removerBody = ""
@@ -100,7 +100,7 @@
setOperationBody(remover, removerBody);
String clearName = "clear" + StringUtils.capitalize(attributeName);
- ObjectModelOperation clear = addOperation(helper, clearName, "void");
+ ObjectModelOperation clear = addOperation(helper, clearName, "void", ObjectModelModifier.STATIC);
addParameter(clear, "Wikitty", "wikitty");
String clearBody = ""
/*{
@@ -114,21 +114,23 @@
// adding getter and setter to contract
String getterName = "get" + StringUtils.capitalize(attributeName);
- ObjectModelOperation getter = addOperation(helper, getterName, attributeType);
+ ObjectModelOperation getter = addOperation(helper, getterName, attributeType, ObjectModelModifier.STATIC);
addParameter(getter, "Wikitty", "wikitty");
setOperationBody(getter, ""
/*{
- <%=attributeType%> result = wikitty.<%=getFieldMethodName%>(<%=extensionVariableName%>, <%=fieldVariableName%>);
- return result;
+ <%=attributeType%> value = wikitty.<%=getFieldMethodName%>(<%=extensionVariableName%>, <%=fieldVariableName%>);
+ return value;
}*/);
String setterName = "set" + StringUtils.capitalize(attributeName);
- ObjectModelOperation setter = addOperation(helper, setterName, "void");
+ ObjectModelOperation setter = addOperation(helper, setterName, attributeType, ObjectModelModifier.STATIC);
addParameter(setter, "Wikitty", "wikitty");
addParameter(setter, attributeType, attributeName);
setOperationBody(setter, ""
/*{
+ <%=attributeType%> oldValue = <%=getter.getName()%>(wikitty);
wikitty.setField(<%=extensionVariableName%>, <%=fieldVariableName%>, <%=attributeName%>);
+ return oldValue;
}*/);
}
}
1
0
r264 - branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator
by bleny＠users.nuiton.org 16 Aug '10
by bleny＠users.nuiton.org 16 Aug '10
16 Aug '10
Author: bleny
Date: 2010-08-16 18:12:57 +0200 (Mon, 16 Aug 2010)
New Revision: 264
Url: http://nuiton.org/repositories/revision/wikitty/264
Log:
bugfixes ; removing static equals
Modified:
branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java
branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java
branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyTransformerUtil.java
Modified: branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java
===================================================================
--- branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java 2010-08-16 14:00:32 UTC (rev 263)
+++ branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java 2010-08-16 16:12:57 UTC (rev 264)
@@ -64,8 +64,6 @@
addConstructors(processedClasses.get(businessEntity));
- addStaticEquals(businessEntity, processedClasses.get(businessEntity));
-
addConstants(businessEntity, processedClasses.get(businessEntity));
}
@@ -104,7 +102,6 @@
"long",
serialVersionUIDs.toString() + "L",
ObjectModelModifier.PRIVATE);
-
}
protected void addConstructors(ObjectModelClass clazz) {
@@ -229,44 +226,6 @@
}
- protected void addStaticEquals(ObjectModelClass businessEntity, ObjectModelClass abstractClass) {
-
- ObjectModelOperation equals = addOperation(abstractClass, "equals", "boolean", ObjectModelModifier.STATIC);
- addParameter(equals, WikittyTransformerUtil.WIKITTY_CLASS_FQN, "w1");
- addParameter(equals, WikittyTransformerUtil.WIKITTY_CLASS_FQN, "w2");
-
- // the body of the equals method, will be assembled while reading attributes
- String equalsBody = ""
-/*{
- boolean result = true;
-}*/;
- String extensionVariableName = WikittyTransformerUtil.classToExtensionVariableName(businessEntity, true);
- for(ObjectModelAttribute attribute : businessEntity.getAttributes()) {
- if (attribute.isNavigable()) {
- // two variables needed below
- String fieldVariableName = WikittyTransformerUtil.attributeToFielVariableName(attribute, true);
-
- // considering field in equals body
- equalsBody += ""
-/*{
- if (result) {
- Object f1 = w1.getFieldAsObject(<%= extensionVariableName %>, <%= fieldVariableName %>);
- Object f2 = w2.getFieldAsObject(<%= extensionVariableName %>, <%= fieldVariableName %>);
- result = f1 == f2 || (f1 != null && f1.equals(f2));
- };
-}*/;
- }
- }
-
- // finishing equals body
- equalsBody += ""
-/*{
- return result;
-}*/;
- setOperationBody(equals, equalsBody);
-
- }
-
protected void addOperations(ObjectModelClass businessEntity, ObjectModelClass abstractClass) {
String extensionVariableName = WikittyTransformerUtil.classToExtensionVariableName(businessEntity, true);
@@ -287,6 +246,7 @@
// attributed is a collection, we will generate operations get, add, remove and clear
String attributeTypeSimpleNameInSet = WikittyTransformerUtil.generateResultType(attribute, true);
+ String getFieldMethodName = WikittyTransformerUtil.generateGetFieldAsCall(attribute);
// now, for this attribute, we will generate add, remove and clear methods
// adding operations to contract
@@ -295,7 +255,7 @@
addAnnotation(abstractClass, getter, "Override");
String getterBody = ""
/*{
- <%= attributeTypeSimpleNameInSet %> result = getWikitty().getFieldAsSet(<%= extensionVariableName %>, <%= fieldVariableName %>, <%= attributeType %>.class);
+ <%= attributeTypeSimpleNameInSet %> result = getWikitty().<%=getFieldMethodName%>(<%= extensionVariableName %>, <%= fieldVariableName %>, <%= attributeType %>.class);
return result;
}*/;
setOperationBody(getter, getterBody);
@@ -334,7 +294,7 @@
} else {
- String getFieldMethodName = WikittyTransformerUtil.generateGetFieldAsCall(attribute.getType());
+ String getFieldMethodName = WikittyTransformerUtil.generateGetFieldAsCall(attribute);
// adding getter and setter to contract
String getterName = "get" + StringUtils.capitalize(attributeName);
@@ -353,8 +313,8 @@
setOperationBody(setter, ""
/*{
Object oldValue = getField(<%=extensionVariableName%>, <%=fieldVariableName%>);
- getWikitty().setField(<%=extensionVariableName%>, <%=fieldVariableName%>, <%=attribute.getName()%>);
- getPropertyChangeSupport().firePropertyChange(<%=fieldVariableName%>, oldValue, <%=attribute.getName()%>);
+ getWikitty().setField(<%=extensionVariableName%>, <%=fieldVariableName%>, <%=attributeName%>);
+ getPropertyChangeSupport().firePropertyChange(<%=fieldVariableName%>, oldValue, <%=attributeName%>);
}*/);
}
}
Modified: branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java
===================================================================
--- branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java 2010-08-16 14:00:32 UTC (rev 263)
+++ branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java 2010-08-16 16:12:57 UTC (rev 264)
@@ -65,6 +65,7 @@
// attributed is a collection, we will generate operations get, add, remove and clear
String attributeTypeSimpleNameInSet = WikittyTransformerUtil.generateResultType(attribute, true);
+ String getFieldMethodName = WikittyTransformerUtil.generateGetFieldAsCall(attribute);
// now, for this attribute, we will generate add, remove and clear methods
// adding operations to contract
@@ -73,7 +74,7 @@
addParameter(getter, "Wikitty", "wikitty");
String getterBody = ""
/*{
- <%=attributeTypeSimpleNameInSet%> result = wikitty.getFieldAsSet(<%=extensionVariableName%>, <%=fieldVariableName%>, <%=attributeType%>.class);
+ <%=attributeTypeSimpleNameInSet%> result = wikitty.<%=getFieldMethodName%>(<%=extensionVariableName%>, <%=fieldVariableName%>, <%=attributeType%>.class);
return result;
}*/;
setOperationBody(getter, getterBody);
@@ -109,7 +110,7 @@
} else {
- String getFieldMethodName = WikittyTransformerUtil.generateGetFieldAsCall(attribute.getType());
+ String getFieldMethodName = WikittyTransformerUtil.generateGetFieldAsCall(attribute);
// adding getter and setter to contract
String getterName = "get" + StringUtils.capitalize(attributeName);
@@ -127,7 +128,7 @@
addParameter(setter, attributeType, attributeName);
setOperationBody(setter, ""
/*{
- wikitty.setField(<%=extensionVariableName%>, <%=fieldVariableName%>, <%=attribute.getName()%>);
+ wikitty.setField(<%=extensionVariableName%>, <%=fieldVariableName%>, <%=attributeName%>);
}*/);
}
}
Modified: branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyTransformerUtil.java
===================================================================
--- branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyTransformerUtil.java 2010-08-16 14:00:32 UTC (rev 263)
+++ branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyTransformerUtil.java 2010-08-16 16:12:57 UTC (rev 264)
@@ -3,6 +3,7 @@
import java.util.HashSet;
import java.util.Set;
+import org.apache.commons.lang.StringUtils;
import org.nuiton.eugene.models.object.ObjectModelAttribute;
import org.nuiton.eugene.models.object.ObjectModelClass;
@@ -77,54 +78,46 @@
* @param typeName a name of a business entity or "String", "Integer" etc.
* @return the name of a method "getFieldAsInt" for example
*/
- protected static String generateGetFieldAsCall(String typeName) {
- String asWhat = FQNtoSimpleName(typeName);
- if ("boolean".equals(asWhat)) {
- asWhat = "Boolean";
- } else if ("int".equals(asWhat) || "Integer".equals(asWhat)) {
- asWhat = "Int";
- } else if ("Date".equals(asWhat)) {
- // asWhat = "Date";
- } else if (commonStrings.contains(asWhat)) {
- asWhat = "String";
+ protected static String generateGetFieldAsCall(ObjectModelAttribute attribute) {
+ String asWhat = null;
+ if (isAttributeCollection(attribute)) {
+ asWhat = getCollectionTypeName(attribute);
} else {
- asWhat = "String";
+ String simpleTypeName = FQNtoSimpleName(attribute.getType());
+ if (commonTypes.contains(simpleTypeName)) {
+ asWhat = StringUtils.capitalize(simpleTypeName);
+ } else {
+ asWhat = "Wikitty";
+ }
}
return "getFieldAs" + asWhat;
}
-
+
/** for a given type of attribute, the getter returned type must be... */
protected static String generateResultType(ObjectModelAttribute attribute,
boolean considerMultiplicity) {
- String type = FQNtoSimpleName(attribute.getType());
-
- if ("boolean".equals(type) || "Boolean".equals(type)) {
- //
- } else if ("int".equals(type) || "Integer".equals(type)) {
- //
- } else if ("Date".equals(type)) {
- //
- } else {
- type = "String";
+ String simpleTypeName = FQNtoSimpleName(attribute.getType());
+ if (! commonTypes.contains(simpleTypeName)) {
+ simpleTypeName = "String"; // return a wikitty Id
}
- String result = type;
if (considerMultiplicity && isAttributeCollection(attribute)) {
- result = "Collection<" + type + ">";
- if (attribute.isUnique()) {
- if (attribute.isOrdered()) {
- result = "LinkedHashSet<" + type + ">";
- } else {
- result = "Set<" + type + ">";
- }
- } else {
- result = "List<" + type + ">";
- }
+ simpleTypeName = getCollectionTypeName(attribute) + "<" + simpleTypeName + ">";
}
- return result;
+ return simpleTypeName;
}
+ protected static String getCollectionTypeName(ObjectModelAttribute attribute) {
+ String result = null;
+ if (attribute.isUnique()) {
+ result = "Set";
+ } else {
+ result = "List";
+ }
+ return result;
+ }
+
public static boolean isAttributeCollection(ObjectModelAttribute attribute) {
return attribute.getMaxMultiplicity() == -1 // -1 is infinity
|| attribute.getMaxMultiplicity() > 1;
@@ -133,21 +126,16 @@
protected static String typeToWikittyColumn(String type) {
String simpleType = FQNtoSimpleName(type);
String result = null;
- if ("Date".equals(simpleType)) {
- result = "Date";
- } else if ("String".equals(simpleType)) {
- result = "String";
- } else if ("boolean".equals(simpleType)) {
- result = "boolean";
- } else if ("int".equals(simpleType) ||
- "Integer".equals(simpleType)) {
- result = "Numeric";
- } else {
+ if (!commonTypes.contains(simpleType)) {
result = "Wikitty";
+ } else if(commonNumerics.contains(simpleType)) {
+ result = "Numeric";
+ } else if(commonStrings.contains(simpleType)) {
+ result = "String";
}
return result;
}
-
+
private static Set<String> commonNumerics;
static {
commonNumerics = new HashSet<String>();
@@ -182,6 +170,4 @@
commonTypes.add("Boolean");
commonTypes.add("Date");
}
-
-
}
1
0
r263 - branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator
by bleny＠users.nuiton.org 16 Aug '10
by bleny＠users.nuiton.org 16 Aug '10
16 Aug '10
Author: bleny
Date: 2010-08-16 16:00:32 +0200 (Mon, 16 Aug 2010)
New Revision: 263
Url: http://nuiton.org/repositories/revision/wikitty/263
Log:
multiple inheritence, refactoring
Modified:
branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java
branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyContractGenerator.java
branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java
branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyImplementationGenerator.java
branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyTransformerUtil.java
Modified: branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java
===================================================================
--- branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java 2010-08-16 09:06:20 UTC (rev 262)
+++ branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java 2010-08-16 14:00:32 UTC (rev 263)
@@ -2,7 +2,9 @@
import java.util.ArrayList;
import java.util.Collection;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import java.util.Random;
import org.apache.commons.lang.StringUtils;
@@ -13,6 +15,7 @@
import org.nuiton.eugene.models.object.ObjectModel;
import org.nuiton.eugene.models.object.ObjectModelAttribute;
import org.nuiton.eugene.models.object.ObjectModelClass;
+import org.nuiton.eugene.models.object.ObjectModelClassifier;
import org.nuiton.eugene.models.object.ObjectModelModifier;
import org.nuiton.eugene.models.object.ObjectModelOperation;
@@ -32,76 +35,106 @@
return new WikittyPurifierTransformer();
}
+ protected Map<ObjectModelClass, ObjectModelClass> processedClasses =
+ new HashMap<ObjectModelClass, ObjectModelClass>();
+
@Override
- public void transformFromClass(ObjectModelClass clazz) {
- ObjectModelClass abstractClass = createAbstractClass(clazz.getName() + "Abstract", clazz.getPackageName());
+ public void transformFromModel(ObjectModel model) {
+ for (ObjectModelClass businessEntity : model.getClasses()) {
+ ObjectModelClass abstractClass = createAbstractClass(businessEntity.getName() + "Abstract", businessEntity.getPackageName());
+ processedClasses.put(businessEntity, abstractClass);
+ setSuperClass(abstractClass, "BusinessEntityWikitty");
+ addInterface(abstractClass, businessEntity.getQualifiedName());
+ }
+
+ for (ObjectModelClass businessEntity : model.getClasses()) {
+ addOperations(businessEntity, processedClasses.get(businessEntity));
+ }
+
+ // at this time, all operations in generated abstracts are just the operations
+ // like get/set etc. we will copy all operations of a given class to all children
+ // that's why constructors and others operations are not yet added
+ for (ObjectModelClass businessEntity : model.getClasses()) {
+ addInheritedOperations(businessEntity, processedClasses.get(businessEntity));
+ }
- // TODO 20100811 bleny remove unused imports
- addImport(abstractClass, WikittyTransformerUtil.BUSINESS_ENTITY_CLASS_FQN);
- addImport(abstractClass, WikittyTransformerUtil.BUSINESS_ENTITY_WIKITTY_CLASS_FQN);
- addImport(abstractClass, WikittyTransformerUtil.WIKITTY_CLASS_FQN);
- addImport(abstractClass, "org.nuiton.wikitty.WikittyExtension");
- addImport(abstractClass, "org.nuiton.wikitty.WikittyUtil");
- addImport(abstractClass, "org.nuiton.wikitty.WikittyUser");
- addImport(abstractClass, "org.nuiton.wikitty.WikittyUserAbstract");
- addImport(abstractClass, "org.nuiton.wikitty.WikittyUserImpl");
- addImport(abstractClass, "org.nuiton.wikitty.TreeNode");
- addImport(abstractClass, "org.nuiton.wikitty.TreeNodeAbstract");
- addImport(abstractClass, "org.nuiton.wikitty.TreeNodeImpl");
- addImport(abstractClass, java.util.List.class);
- addImport(abstractClass, java.util.ArrayList.class);
- addImport(abstractClass, java.util.Collection.class);
- addImport(abstractClass, java.util.Collections.class);
- addImport(abstractClass, java.util.Set.class);
- addImport(abstractClass, java.util.Date.class);
+ for (ObjectModelClass businessEntity : model.getClasses()) {
- addInterface(abstractClass, clazz.getQualifiedName());
+ addImports(processedClasses.get(businessEntity));
- Collection<ObjectModelClass> superClasses = clazz.getSuperclasses();
- if (superClasses.isEmpty()) {
- // no inheritance so inheritance from BusinessEntityWikitty
- setSuperClass(abstractClass, "BusinessEntityWikitty");
- } else {
- for (ObjectModelClass superClass : superClasses) {
- // using "for" but there will be 0 or 1 iteration
- addInterface(abstractClass, superClass.getQualifiedName());
- setSuperClass(abstractClass, superClass.getQualifiedName() + "Impl");
- }
+ addConstructors(processedClasses.get(businessEntity));
+
+ addStaticEquals(businessEntity, processedClasses.get(businessEntity));
+
+ addConstants(businessEntity, processedClasses.get(businessEntity));
}
+ processedClasses.clear();
+ }
+
+
+ protected void addImports(ObjectModelClass clazz) {
+ // TODO 20100811 bleny remove unused imports
+ addImport(clazz, WikittyTransformerUtil.BUSINESS_ENTITY_CLASS_FQN);
+ addImport(clazz, WikittyTransformerUtil.BUSINESS_ENTITY_WIKITTY_CLASS_FQN);
+ addImport(clazz, WikittyTransformerUtil.WIKITTY_CLASS_FQN);
+ addImport(clazz, "org.nuiton.wikitty.WikittyExtension");
+ addImport(clazz, "org.nuiton.wikitty.WikittyUtil");
+ addImport(clazz, "org.nuiton.wikitty.WikittyUser");
+ addImport(clazz, "org.nuiton.wikitty.WikittyUserAbstract");
+ addImport(clazz, "org.nuiton.wikitty.WikittyUserImpl");
+ addImport(clazz, "org.nuiton.wikitty.TreeNode");
+ addImport(clazz, "org.nuiton.wikitty.TreeNodeAbstract");
+ addImport(clazz, "org.nuiton.wikitty.TreeNodeImpl");
+ addImport(clazz, java.util.List.class);
+ addImport(clazz, java.util.ArrayList.class);
+ addImport(clazz, java.util.Collection.class);
+ addImport(clazz, java.util.Collections.class);
+ addImport(clazz, java.util.Set.class);
+ addImport(clazz, java.util.Date.class);
+ addImport(clazz, java.util.LinkedHashSet.class);
+ }
+
+ protected void addSerialVersionUID(ObjectModelClass clazz) {
// adding a generated serialVersionUID
Random random = new Random();
Long serialVersionUIDs = random.nextLong();
- addConstant(abstractClass,
+ addConstant(clazz,
"serialVersionUID",
"long",
serialVersionUIDs.toString() + "L",
ObjectModelModifier.PRIVATE);
- ObjectModelOperation constructor = addConstructor(abstractClass, ObjectModelModifier.PUBLIC);
+ }
+
+ protected void addConstructors(ObjectModelClass clazz) {
+
+ ObjectModelOperation constructor = addConstructor(clazz, ObjectModelModifier.PUBLIC);
setOperationBody(constructor, ""
/*{
super();
}*/);
- constructor = addConstructor(abstractClass, ObjectModelModifier.PUBLIC);
+ constructor = addConstructor(clazz, ObjectModelModifier.PUBLIC);
addParameter(constructor, WikittyTransformerUtil.WIKITTY_CLASS_FQN, "wikitty");
setOperationBody(constructor, ""
/*{
super(wikitty);
}*/);
- constructor = addConstructor(abstractClass, ObjectModelModifier.PUBLIC);
+ constructor = addConstructor(clazz, ObjectModelModifier.PUBLIC);
addParameter(constructor, WikittyTransformerUtil.BUSINESS_ENTITY_WIKITTY_CLASS_FQN, "businessEntityWikitty");
setOperationBody(constructor, ""
/*{
super(businessEntityWikitty.getWikitty());
}*/);
-
+ }
+
+ protected void addConstants(ObjectModelClass businessEntity, ObjectModelClass abstractClass) {
// adding some constants about extension to abstract
addConstant(abstractClass, "extensions", "List<WikittyExtension>", null, ObjectModelModifier.PUBLIC);
- addConstant(abstractClass, "extension" + clazz.getName(), "WikittyExtension", null, ObjectModelModifier.PUBLIC);
+ addConstant(abstractClass, "extension" + businessEntity.getName(), "WikittyExtension", null, ObjectModelModifier.PUBLIC);
// ... and a getter
ObjectModelOperation getStaticExtensions = addOperation(abstractClass, "getStaticExtensions", "Collection<WikittyExtension>", ObjectModelModifier.PUBLIC);
@@ -111,45 +144,6 @@
return extensions;
}*/);
-
- //// preparing static equals(w1, w2)
-
- ObjectModelOperation equals = addOperation(abstractClass, "equals", "boolean", ObjectModelModifier.STATIC);
- addParameter(equals, WikittyTransformerUtil.WIKITTY_CLASS_FQN, "w1");
- addParameter(equals, WikittyTransformerUtil.WIKITTY_CLASS_FQN, "w2");
-
- // the body of the equals method, will be assembled while reading attributes
- String equalsBody = ""
-/*{
- boolean result = true;
-}*/;
- String extensionVariableName = WikittyTransformerUtil.classToExtensionVariableName(clazz, true);
- for(ObjectModelAttribute attribute : clazz.getAttributes()) {
- if (attribute.isNavigable()) {
- // two variables needed below
- // String fieldVariableName = "FIELD_" + clazz.getName().toUpperCase() + "_" + attribute.getName().toUpperCase();
- String fieldVariableName = WikittyTransformerUtil.attributeToFielVariableName(attribute, true);
-
- // considering field in equals body
- equalsBody += ""
-/*{
- if (result) {
- Object f1 = w1.getFieldAsObject(<%= extensionVariableName %>, <%= fieldVariableName %>);
- Object f2 = w2.getFieldAsObject(<%= extensionVariableName %>, <%= fieldVariableName %>);
- result = f1 == f2 || (f1 != null && f1.equals(f2));
- };
-}*/;
- }
- }
-
- // finishing equals body
- equalsBody += ""
-/*{
- return result;
-}*/;
- setOperationBody(equals, equalsBody);
-
-
//// preparing a static block to initialize those constants
ObjectModelOperation staticInitialization = addBlock(abstractClass, ObjectModelModifier.STATIC);
@@ -160,7 +154,7 @@
// now process attributes
- for(ObjectModelAttribute attribute : clazz.getAttributes()) {
+ for(ObjectModelAttribute attribute : businessEntity.getAttributes()) {
if (attribute.isNavigable()) {
// now add the attribute to the piece of code that build the extension
String wikittyType = WikittyTransformerUtil.typeToWikittyColumn(attribute.getType());
@@ -189,24 +183,25 @@
}
// finishing static block
- String extensionVersion = clazz.getTagValue("version");
+ String extensionVersion = businessEntity.getTagValue("version");
if (extensionVersion == null || "".equals(extensionVersion)) {
extensionVersion = "0.1";
- log.warn("no version specified in model for " + clazz.getQualifiedName() + " using " + extensionVersion);
+ log.warn("no version specified in model for " + businessEntity.getQualifiedName() + " using " + extensionVersion);
}
// a piece of code used in the static block
String requires = null;
- for (ObjectModelClass superClass : superClasses) {
+ for (ObjectModelClass superClass : businessEntity.getSuperclasses()) {
// using "for" but there will be 0 or 1 iteration
requires = WikittyTransformerUtil.classToExtensionVariableName(superClass, true);
}
String buildFieldMapExtensionParametersInLine = StringUtils.join(buildFieldMapExtensionParameters, ", \n");
+ String extensionVariableName = WikittyTransformerUtil.classToExtensionVariableName(businessEntity, false);
String staticInitializationBody = ""
/*{
- extension<%=clazz.getName()%> =
- new WikittyExtension(EXT_<%=clazz.getName().toUpperCase()%>,
+ extension<%=businessEntity.getName()%> =
+ new WikittyExtension(<%=extensionVariableName%>,
"<%=extensionVersion%>", // version
<%= requires %>,
WikittyUtil.buildFieldMapExtension( // building field map
@@ -216,7 +211,7 @@
List<WikittyExtension> exts = new ArrayList<WikittyExtension>();
}*/;
- for (ObjectModelClass superClass : superClasses) {
+ for (ObjectModelClass superClass : businessEntity.getSuperclasses()) {
// using "for" but there will be 0 or 1 iteration
staticInitializationBody += ""
/*{
@@ -227,15 +222,56 @@
staticInitializationBody += ""
/*{
- exts.add(extension<%=clazz.getName()%>);
+ exts.add(extension<%=businessEntity.getName()%>);
extensions = Collections.unmodifiableList(exts);
}*/;
setOperationBody(staticInitialization, staticInitializationBody);
+ }
+
+ protected void addStaticEquals(ObjectModelClass businessEntity, ObjectModelClass abstractClass) {
+ ObjectModelOperation equals = addOperation(abstractClass, "equals", "boolean", ObjectModelModifier.STATIC);
+ addParameter(equals, WikittyTransformerUtil.WIKITTY_CLASS_FQN, "w1");
+ addParameter(equals, WikittyTransformerUtil.WIKITTY_CLASS_FQN, "w2");
+
+ // the body of the equals method, will be assembled while reading attributes
+ String equalsBody = ""
+/*{
+ boolean result = true;
+}*/;
+ String extensionVariableName = WikittyTransformerUtil.classToExtensionVariableName(businessEntity, true);
+ for(ObjectModelAttribute attribute : businessEntity.getAttributes()) {
+ if (attribute.isNavigable()) {
+ // two variables needed below
+ String fieldVariableName = WikittyTransformerUtil.attributeToFielVariableName(attribute, true);
+ // considering field in equals body
+ equalsBody += ""
+/*{
+ if (result) {
+ Object f1 = w1.getFieldAsObject(<%= extensionVariableName %>, <%= fieldVariableName %>);
+ Object f2 = w2.getFieldAsObject(<%= extensionVariableName %>, <%= fieldVariableName %>);
+ result = f1 == f2 || (f1 != null && f1.equals(f2));
+ };
+}*/;
+ }
+ }
+
+ // finishing equals body
+ equalsBody += ""
+/*{
+ return result;
+}*/;
+ setOperationBody(equals, equalsBody);
+
+ }
+
+ protected void addOperations(ObjectModelClass businessEntity, ObjectModelClass abstractClass) {
+ String extensionVariableName = WikittyTransformerUtil.classToExtensionVariableName(businessEntity, true);
+
// generating operations with bodies to realize contract
- for (ObjectModelAttribute attribute : clazz.getAttributes()) {
+ for (ObjectModelAttribute attribute : businessEntity.getAttributes()) {
if (attribute.isNavigable()) {
// needed below, in templates
String fieldVariableName = WikittyTransformerUtil.attributeToFielVariableName(attribute, true);
@@ -323,5 +359,28 @@
}
}
}
+
}
+
+ protected void addInheritedOperations(ObjectModelClass businessEntity, ObjectModelClass abstractClass) {
+ // now, add to this abstract all operation due to inheritence from
+ // other business entities
+
+ for (ObjectModelClass superClass : businessEntity.getSuperclasses()) {
+ addInterface(abstractClass, superClass.getQualifiedName()); // extends ?
+ // setSuperClass(abstractClass, superClass.getQualifiedName() + "Impl");
+ if (WikittyTransformerUtil.isBusinessEntity(superClass)) {
+ // getting the signatures and bodies of those operations
+ for (ObjectModelOperation operation : processedClasses.get(superClass).getOperations()) {
+
+ ObjectModelOperation operationClone = cloneOperationSignature(operation, abstractClass, true);
+ setOperationBody(operationClone, operation.getBodyCode());
+
+ // XXX 20100816 bleny should be a call to cloneOperation(operation, abstractClass, true);
+ }
+ }
+ }
+
+
+ }
}
Modified: branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyContractGenerator.java
===================================================================
--- branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyContractGenerator.java 2010-08-16 09:06:20 UTC (rev 262)
+++ branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyContractGenerator.java 2010-08-16 14:00:32 UTC (rev 263)
@@ -1,6 +1,10 @@
package org.nuiton.wikitty.generator;
+import java.util.ArrayList;
import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
@@ -32,9 +36,25 @@
return new WikittyPurifierTransformer();
}
+
+ protected Map<ObjectModelClass, ObjectModelInterface> processedClasses =
+ new HashMap<ObjectModelClass, ObjectModelInterface>();
+
@Override
- public void transformFromClass(ObjectModelClass clazz) {
+ public void transformFromModel(ObjectModel model) {
+
+ log.info(model.getClasses().size() + " classes to process");
+ for (ObjectModelClass clazz : model.getClasses()) {
+ processClass(clazz);
+ }
+
+ processedClasses.clear();
+
+ }
+
+ protected void processClass(ObjectModelClass clazz) {
+ log.info("will process " + clazz.getPackageName() + ".." + clazz.getName());
ObjectModelInterface contract = createInterface(clazz.getName(), clazz.getPackageName());
addInterface(contract, WikittyTransformerUtil.BUSINESS_ENTITY_CLASS_FQN);
@@ -56,24 +76,17 @@
addImport(contract, java.util.Collections.class);
addImport(contract, java.util.Set.class);
addImport(contract, java.util.Date.class);
+ addImport(contract, java.util.LinkedHashSet.class);
setDocumentation(contract, clazz.getDocumentation());
-
- Collection<ObjectModelClass> superClasses = clazz.getSuperclasses();
- if (! superClasses.isEmpty()) {
- for (ObjectModelClass superClass : superClasses) {
- // using "for" but there will be 0 or 1 iteration
- addInterface(contract, superClass.getQualifiedName());
- }
- }
-
+
// adding public static final String EXT_CLIENT = "Client";
addConstant(contract,
"EXT_" + clazz.getName().toUpperCase(),
"String",
"\"" + clazz.getName() + "\"",
ObjectModelModifier.PUBLIC);
-
+
String extensionVariableName = WikittyTransformerUtil.classToExtensionVariableName(clazz, false);
for(ObjectModelAttribute attribute : clazz.getAttributes()) {
@@ -107,9 +120,9 @@
// there is a conflict, purifier transformer give as the right name to use
attributeName = attribute.getTagValue(WikittyTransformerUtil.TAG_ALTERNATIVE_NAME);
}
-
+
ObjectModelOperation getter;
-
+
if (attribute.getMaxMultiplicity() > 1 || attribute.getMaxMultiplicity() == -1) {
// attributed is a collection, we will generate operations get, add, remove and clear
@@ -145,5 +158,25 @@
setDocumentation(getter, attribute.getDocumentation());
}
}
+
+ // now, add to this contract all operation due to inheritence from
+ // other business entities
+ Collection<ObjectModelClass> superClasses = clazz.getSuperclasses();
+ for (ObjectModelClass superClass : superClasses) {
+ addInterface(contract, superClass.getQualifiedName()); // extends ?
+ if (WikittyTransformerUtil.isBusinessEntity(superClass)) {
+ // superclass must have benn processed first to have its operations set
+ if (! processedClasses.containsKey(superClass)) {
+ processClass(superClass);
+ }
+
+ // getting the signatures of thoses operation
+ for (ObjectModelOperation operation : processedClasses.get(superClass).getOperations()) {
+ cloneOperationSignature(operation, contract, true);
+ }
+ }
+ }
+
+ processedClasses.put(clazz, contract);
}
}
Modified: branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java
===================================================================
--- branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java 2010-08-16 09:06:20 UTC (rev 262)
+++ branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java 2010-08-16 14:00:32 UTC (rev 263)
@@ -39,6 +39,7 @@
addImport(helper, java.util.Collections.class);
addImport(helper, java.util.Set.class);
addImport(helper, java.util.Date.class);
+ addImport(helper, java.util.LinkedHashSet.class);
// making constructor for helper class (empty and private)
ObjectModelOperation constructor = addConstructor(helper, ObjectModelModifier.PRIVATE);
Modified: branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyImplementationGenerator.java
===================================================================
--- branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyImplementationGenerator.java 2010-08-16 09:06:20 UTC (rev 262)
+++ branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyImplementationGenerator.java 2010-08-16 14:00:32 UTC (rev 263)
@@ -38,6 +38,7 @@
addImport(implementation, java.util.Collections.class);
addImport(implementation, java.util.Set.class);
addImport(implementation, java.util.Date.class);
+ addImport(implementation, java.util.LinkedHashSet.class);
setSuperClass(implementation, clazz.getQualifiedName() + "Abstract");
Modified: branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyTransformerUtil.java
===================================================================
--- branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyTransformerUtil.java 2010-08-16 09:06:20 UTC (rev 262)
+++ branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyTransformerUtil.java 2010-08-16 14:00:32 UTC (rev 263)
@@ -55,6 +55,7 @@
/** given "my.java.package.MyClass" or "MyClass" return "MyClass" */
protected static String FQNtoSimpleName(String fqn) {
+ // XXX should use GeneratorUtil#getSimpleName(String)
int lastDotIndex = fqn.lastIndexOf(".");
String simpleName = fqn;
if (lastDotIndex != -1) {
@@ -84,6 +85,8 @@
asWhat = "Int";
} else if ("Date".equals(asWhat)) {
// asWhat = "Date";
+ } else if (commonStrings.contains(asWhat)) {
+ asWhat = "String";
} else {
asWhat = "String";
}
@@ -110,8 +113,7 @@
result = "Collection<" + type + ">";
if (attribute.isUnique()) {
if (attribute.isOrdered()) {
- // FIXME 20100813 bleny doesn't take isUnique into account
- result = "List<" + type + ">";
+ result = "LinkedHashSet<" + type + ">";
} else {
result = "Set<" + type + ">";
}
1
0
r262 - branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator
by bleny＠users.nuiton.org 16 Aug '10
by bleny＠users.nuiton.org 16 Aug '10
16 Aug '10
Author: bleny
Date: 2010-08-16 11:06:20 +0200 (Mon, 16 Aug 2010)
New Revision: 262
Url: http://nuiton.org/repositories/revision/wikitty/262
Log:
starting multiple inheritance support
Modified:
branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java
branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java
branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyMetaTransformer.java
branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyPurifierTransformer.java
branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyTransformerUtil.java
Modified: branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java
===================================================================
--- branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java 2010-08-13 15:21:26 UTC (rev 261)
+++ branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java 2010-08-16 09:06:20 UTC (rev 262)
@@ -239,7 +239,7 @@
if (attribute.isNavigable()) {
// needed below, in templates
String fieldVariableName = WikittyTransformerUtil.attributeToFielVariableName(attribute, true);
- String attributeType = WikittyTransformerUtil.generateResultType(attribute.getType());
+ String attributeType = WikittyTransformerUtil.generateResultType(attribute, false);
String attributeName = attribute.getName();
if (attribute.hasTagValue(WikittyTransformerUtil.TAG_ALTERNATIVE_NAME)) {
@@ -250,7 +250,7 @@
if (WikittyTransformerUtil.isAttributeCollection(attribute)) {
// attributed is a collection, we will generate operations get, add, remove and clear
- String attributeTypeSimpleNameInSet = "Set<" + attributeType + ">";
+ String attributeTypeSimpleNameInSet = WikittyTransformerUtil.generateResultType(attribute, true);
// now, for this attribute, we will generate add, remove and clear methods
// adding operations to contract
Modified: branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java
===================================================================
--- branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java 2010-08-13 15:21:26 UTC (rev 261)
+++ branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java 2010-08-16 09:06:20 UTC (rev 262)
@@ -80,7 +80,7 @@
String addName = "add" + StringUtils.capitalize(attributeName);
ObjectModelOperation adder = addOperation(helper, addName, "void");
addParameter(adder, "Wikitty", "wikitty");
- addParameter(adder, "String", "element");
+ addParameter(adder, attributeType, "element");
String adderBody = ""
/*{
wikitty.addToField(<%=extensionVariableName%>, <%=fieldVariableName%>, element);
@@ -90,7 +90,7 @@
String removeName = "remove" + StringUtils.capitalize(attributeName);
ObjectModelOperation remover = addOperation(helper, removeName, "void");
addParameter(remover, "Wikitty", "wikitty");
- addParameter(remover, "String", "element");
+ addParameter(remover, attributeType, "element");
String removerBody = ""
/*{
wikitty.removeFromField(<%=extensionVariableName%>, <%=fieldVariableName%>, element);
Modified: branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyMetaTransformer.java
===================================================================
--- branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyMetaTransformer.java 2010-08-13 15:21:26 UTC (rev 261)
+++ branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyMetaTransformer.java 2010-08-16 09:06:20 UTC (rev 262)
@@ -36,11 +36,13 @@
private static final Log log = LogFactory.getLog(WikittyMetaTransformer.class);
public WikittyMetaTransformer() {
+
super(WikittyContractGenerator.class,
WikittyAbstractGenerator.class,
WikittyImplementationGenerator.class,
WikittyHelperGenerator.class
);
+
}
/** */
@@ -53,6 +55,7 @@
for (ObjectModelClass clazz : model.getClasses()) {
+ // warn user if deprecated stereotype is used
if (clazz.getStereotypes().contains(WikittyTransformerUtil.BUSINESS_ENTITY_STEREOTYPE_OLD_NAME)) {
log.warn(clazz.getQualifiedName() + " uses deprecated \"" +
WikittyTransformerUtil.BUSINESS_ENTITY_STEREOTYPE_OLD_NAME
Modified: branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyPurifierTransformer.java
===================================================================
--- branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyPurifierTransformer.java 2010-08-13 15:21:26 UTC (rev 261)
+++ branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyPurifierTransformer.java 2010-08-16 09:06:20 UTC (rev 262)
@@ -68,50 +68,47 @@
// allUsedNames contains name that we
// can't use without generating a conflict
for (ObjectModelAttribute attribute : clazz.getAttributes()) {
- if (allUsedNames.contains(attribute.getName())) {
- // conflict !
+
+ // will be null as long as a non-conflicting name is found
+ String attributeName = null;
- // let's try to find an alternative name for this attribute
- // as long as we has not found, alternativeName should
- // remains null
- String alternativeName = null;
-
- // first, try to use an alternative name provided by the user in the model
- if (attribute.hasTagValue(WikittyTransformerUtil.TAG_ALTERNATIVE_NAME)) {
- alternativeName = attribute.getTagValue(WikittyTransformerUtil.TAG_ALTERNATIVE_NAME);
- if (allUsedNames.contains(alternativeName)) {
- // using alternative name lead to a conflict
- alternativeName = null;
- }
+ if (attribute.hasTagValue(WikittyTransformerUtil.TAG_ALTERNATIVE_NAME)) {
+ attributeName = attribute.getTagValue(WikittyTransformerUtil.TAG_ALTERNATIVE_NAME);
+ if (allUsedNames.contains(attributeName)) {
+ // using alternative name lead to a conflict
+ attribute.getTagValues().remove(WikittyTransformerUtil.TAG_ALTERNATIVE_NAME);
+ attributeName = null;
}
+ }
- if (alternativeName == null) {
- // it wasn't a success, try to generate an alternative name
- alternativeName = attribute.getName() + "From" + clazz.getName();
- if (allUsedNames.contains(alternativeName)) {
- log.error("are you joking ? do you *really* " +
- "need to call an attribue" +
- alternativeName + " ?");
- alternativeName = null;
- }
+ if (attributeName == null) {
+ attributeName = attribute.getName();
+ if (allUsedNames.contains(attributeName)) {
+ // using alternative name lead to a conflict
+ attributeName = null;
}
-
- if (alternativeName == null) {
- // still no alternative :-(
- log.error("no way to resolve conflict with attribute" +
- attribute.getName() + " from class " + clazz
- + ". You should add or change a tagValue \"" +
- WikittyTransformerUtil.TAG_ALTERNATIVE_NAME +
- "\" on this attribute");
+ }
+
+ if (attributeName == null) {
+ attributeName = attribute.getName() + "From" + clazz.getName();
+ if (allUsedNames.contains(attributeName)) {
+ // using alternative name lead to a conflict
+ attributeName = null;
} else {
- // using alternative name is OK
- addTagValue(WikittyTransformerUtil.TAG_ALTERNATIVE_NAME, alternativeName);
- allUsedNames.add(alternativeName);
+ addTagValue(attribute, WikittyTransformerUtil.TAG_ALTERNATIVE_NAME, attributeName);
}
-
+ }
+
+ // finally
+ if (attributeName == null) {
+ // still no alternative :-(
+ log.error("no way to resolve conflict with attribute" +
+ attribute.getName() + " from class " + clazz
+ + ". You should add or change a tagValue \"" +
+ WikittyTransformerUtil.TAG_ALTERNATIVE_NAME +
+ "\" on this attribute");
} else {
- // no conflict, we name consider this attribute name as taken
- allUsedNames.add(attribute.getName());
+ allUsedNames.add(attributeName);
}
}
Modified: branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyTransformerUtil.java
===================================================================
--- branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyTransformerUtil.java 2010-08-13 15:21:26 UTC (rev 261)
+++ branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyTransformerUtil.java 2010-08-16 09:06:20 UTC (rev 262)
@@ -110,7 +110,7 @@
result = "Collection<" + type + ">";
if (attribute.isUnique()) {
if (attribute.isOrdered()) {
- // FIXME 20100813 doesn't take isUnique into account
+ // FIXME 20100813 bleny doesn't take isUnique into account
result = "List<" + type + ">";
} else {
result = "Set<" + type + ">";
@@ -146,5 +146,40 @@
return result;
}
+ private static Set<String> commonNumerics;
+ static {
+ commonNumerics = new HashSet<String>();
+ commonNumerics.add("byte");
+ commonNumerics.add("Byte");
+ commonNumerics.add("short");
+ commonNumerics.add("Short");
+ commonNumerics.add("int");
+ commonNumerics.add("Integer");
+ commonNumerics.add("long");
+ commonNumerics.add("Long");
+ commonNumerics.add("float");
+ commonNumerics.add("Float");
+ commonNumerics.add("double");
+ commonNumerics.add("Double");
+ }
+ private static Set<String> commonStrings;
+ static {
+ commonStrings = new HashSet<String>();
+ commonStrings.add("char");
+ commonStrings.add("Char");
+ commonStrings.add("String");
+ }
+
+ private static Set<String> commonTypes;
+ static {
+ commonTypes = new HashSet<String>();
+ commonTypes.addAll(commonNumerics);
+ commonTypes.addAll(commonStrings);
+ commonTypes.add("boolean");
+ commonTypes.add("Boolean");
+ commonTypes.add("Date");
+ }
+
+
}
1
0
r261 - in branches/wikitty-eugene-migration: . wikitty-generators/src/main/java/org/nuiton/wikitty/generator
by bleny＠users.nuiton.org 13 Aug '10
by bleny＠users.nuiton.org 13 Aug '10
13 Aug '10
Author: bleny
Date: 2010-08-13 17:21:26 +0200 (Fri, 13 Aug 2010)
New Revision: 261
Url: http://nuiton.org/repositories/revision/wikitty/261
Log:
update POM ; bug fixes in transformers
Modified:
branches/wikitty-eugene-migration/pom.xml
branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java
branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyContractGenerator.java
branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java
branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyTransformerUtil.java
Modified: branches/wikitty-eugene-migration/pom.xml
===================================================================
--- branches/wikitty-eugene-migration/pom.xml 2010-08-13 13:40:59 UTC (rev 260)
+++ branches/wikitty-eugene-migration/pom.xml 2010-08-13 15:21:26 UTC (rev 261)
@@ -223,7 +223,7 @@
<projectId>wikitty</projectId>
<!-- common versions used in sub-poms -->
- <eugene.version>2.1.1</eugene.version>
+ <eugene.version>2.1.2-SNAPSHOT</eugene.version>
<spring.version>3.0.1.RELEASE</spring.version>
<jetty.version>6.1.22</jetty.version>
Modified: branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java
===================================================================
--- branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java 2010-08-13 13:40:59 UTC (rev 260)
+++ branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java 2010-08-13 15:21:26 UTC (rev 261)
@@ -123,12 +123,12 @@
/*{
boolean result = true;
}*/;
- String extensionVariableName = WikittyTransformerUtil.classToExtensionVariableName(clazz);
+ String extensionVariableName = WikittyTransformerUtil.classToExtensionVariableName(clazz, true);
for(ObjectModelAttribute attribute : clazz.getAttributes()) {
if (attribute.isNavigable()) {
// two variables needed below
// String fieldVariableName = "FIELD_" + clazz.getName().toUpperCase() + "_" + attribute.getName().toUpperCase();
- String fieldVariableName = WikittyTransformerUtil.attributeToFielVariableName(attribute);
+ String fieldVariableName = WikittyTransformerUtil.attributeToFielVariableName(attribute, true);
// considering field in equals body
equalsBody += ""
@@ -199,7 +199,7 @@
String requires = null;
for (ObjectModelClass superClass : superClasses) {
// using "for" but there will be 0 or 1 iteration
- requires = superClass.getName() + "." + WikittyTransformerUtil.classToExtensionVariableName(superClass);
+ requires = WikittyTransformerUtil.classToExtensionVariableName(superClass, true);
}
String buildFieldMapExtensionParametersInLine = StringUtils.join(buildFieldMapExtensionParameters, ", \n");
@@ -238,7 +238,7 @@
for (ObjectModelAttribute attribute : clazz.getAttributes()) {
if (attribute.isNavigable()) {
// needed below, in templates
- String fieldVariableName = WikittyTransformerUtil.attributeToFielVariableName(attribute);
+ String fieldVariableName = WikittyTransformerUtil.attributeToFielVariableName(attribute, true);
String attributeType = WikittyTransformerUtil.generateResultType(attribute.getType());
String attributeName = attribute.getName();
@@ -247,7 +247,7 @@
attributeName = attribute.getTagValue(WikittyTransformerUtil.TAG_ALTERNATIVE_NAME);
}
- if (attribute.getMaxMultiplicity() > 1 || attribute.getMaxMultiplicity() == -1) {
+ if (WikittyTransformerUtil.isAttributeCollection(attribute)) {
// attributed is a collection, we will generate operations get, add, remove and clear
String attributeTypeSimpleNameInSet = "Set<" + attributeType + ">";
Modified: branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyContractGenerator.java
===================================================================
--- branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyContractGenerator.java 2010-08-13 13:40:59 UTC (rev 260)
+++ branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyContractGenerator.java 2010-08-13 15:21:26 UTC (rev 261)
@@ -57,6 +57,8 @@
addImport(contract, java.util.Set.class);
addImport(contract, java.util.Date.class);
+ setDocumentation(contract, clazz.getDocumentation());
+
Collection<ObjectModelClass> superClasses = clazz.getSuperclasses();
if (! superClasses.isEmpty()) {
for (ObjectModelClass superClass : superClasses) {
@@ -72,12 +74,12 @@
"\"" + clazz.getName() + "\"",
ObjectModelModifier.PUBLIC);
- String extensionVariableName = WikittyTransformerUtil.classToExtensionVariableName(clazz);
+ String extensionVariableName = WikittyTransformerUtil.classToExtensionVariableName(clazz, false);
for(ObjectModelAttribute attribute : clazz.getAttributes()) {
if (attribute.isNavigable()) {
// two variables needed below
- String fieldVariableName = WikittyTransformerUtil.attributeToFielVariableName(attribute);
+ String fieldVariableName = WikittyTransformerUtil.attributeToFielVariableName(attribute, false);
// adding constants to contract
addConstant(contract,
@@ -97,8 +99,8 @@
for (ObjectModelAttribute attribute : clazz.getAttributes()) {
if (attribute.isNavigable()) {
// needed below, in templates
- String fieldVariableName = WikittyTransformerUtil.attributeToFielVariableName(attribute);
- String attributeType = WikittyTransformerUtil.generateResultType(attribute.getType());
+ String fieldVariableName = WikittyTransformerUtil.attributeToFielVariableName(attribute, true);
+ String attributeType = WikittyTransformerUtil.generateResultType(attribute, false);
String attributeName = attribute.getName();
if (attribute.hasTagValue(WikittyTransformerUtil.TAG_ALTERNATIVE_NAME)) {
@@ -106,15 +108,17 @@
attributeName = attribute.getTagValue(WikittyTransformerUtil.TAG_ALTERNATIVE_NAME);
}
+ ObjectModelOperation getter;
+
if (attribute.getMaxMultiplicity() > 1 || attribute.getMaxMultiplicity() == -1) {
// attributed is a collection, we will generate operations get, add, remove and clear
- String attributeTypeSimpleNameInSet = "Set<" + attributeType + ">";
+ String attributeTypeSimpleNameInSet = WikittyTransformerUtil.generateResultType(attribute, true);
// now, for this attribute, we will generate add, remove and clear methods
// adding operations to contract
String getterName = "get" + StringUtils.capitalize(attributeName);
- addOperation(contract, getterName, attributeTypeSimpleNameInSet);
+ getter = addOperation(contract, getterName, attributeTypeSimpleNameInSet);
String addName = "add" + StringUtils.capitalize(attributeName);
ObjectModelOperation adder = addOperation(contract, addName, "void");
@@ -131,12 +135,14 @@
} else {
// attribute is not a collection, we generate a getter and a setter
String getterName = "get" + StringUtils.capitalize(attributeName);
- addOperation(contract, getterName, attributeType);
+ getter = addOperation(contract, getterName, attributeType);
String setterName = "set" + StringUtils.capitalize(attributeName);
ObjectModelOperation setter = addOperation(contract, setterName, "void");
addParameter(setter, attributeType, attributeName);
}
+
+ setDocumentation(getter, attribute.getDocumentation());
}
}
}
Modified: branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java
===================================================================
--- branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java 2010-08-13 13:40:59 UTC (rev 260)
+++ branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java 2010-08-13 15:21:26 UTC (rev 261)
@@ -39,41 +39,36 @@
addImport(helper, java.util.Collections.class);
addImport(helper, java.util.Set.class);
addImport(helper, java.util.Date.class);
-
- // provides interface constants for to the helper
- setSuperClass(helper, clazz.getQualifiedName() + "Impl");
// making constructor for helper class (empty and private)
ObjectModelOperation constructor = addConstructor(helper, ObjectModelModifier.PRIVATE);
- setOperationBody(constructor, "\n// utility class\n"); // empty implementation
-
-
+ setDocumentation(constructor, "utility class all provided methods are accessible the static way");
+ setOperationBody(constructor, "// empty\n"); // empty implementation
- String extensionVariableName = WikittyTransformerUtil.classToExtensionVariableName(clazz);
+ String extensionVariableName = WikittyTransformerUtil.classToExtensionVariableName(clazz, true);
// generating operations with bodies to realize contract
for (ObjectModelAttribute attribute : clazz.getAttributes()) {
if (attribute.isNavigable()) {
// needed below, in templates
- String fieldVariableName = WikittyTransformerUtil.attributeToFielVariableName(attribute);
- String attributeType = WikittyTransformerUtil.generateResultType(attribute.getType());
+ String fieldVariableName = WikittyTransformerUtil.attributeToFielVariableName(attribute, true);
+ String attributeType = WikittyTransformerUtil.generateResultType(attribute, false);
String attributeName = attribute.getName();
if (attribute.hasTagValue(WikittyTransformerUtil.TAG_ALTERNATIVE_NAME)) {
// there is a conflict, purifier transformer give as the right name to use
attributeName = attribute.getTagValue(WikittyTransformerUtil.TAG_ALTERNATIVE_NAME);
}
-
- if (attribute.getMaxMultiplicity() > 1 || attribute.getMaxMultiplicity() == -1) {
+
+ if (WikittyTransformerUtil.isAttributeCollection(attribute)) {
// attributed is a collection, we will generate operations get, add, remove and clear
-
- String attributeTypeSimpleNameInSet = "Set<" + attributeType + ">";
-
+
+ String attributeTypeSimpleNameInSet = WikittyTransformerUtil.generateResultType(attribute, true);
+
// now, for this attribute, we will generate add, remove and clear methods
// adding operations to contract
String getterName = "get" + StringUtils.capitalize(attributeName);
ObjectModelOperation getter = addOperation(helper, getterName, attributeTypeSimpleNameInSet);
- addAnnotation(helper, getter, "Override");
addParameter(getter, "Wikitty", "wikitty");
String getterBody = ""
/*{
@@ -81,36 +76,33 @@
return result;
}*/;
setOperationBody(getter, getterBody);
-
+
String addName = "add" + StringUtils.capitalize(attributeName);
ObjectModelOperation adder = addOperation(helper, addName, "void");
- addAnnotation(helper, adder, "Override");
- addParameter(getter, "Wikitty", "wikitty");
+ addParameter(adder, "Wikitty", "wikitty");
addParameter(adder, "String", "element");
String adderBody = ""
/*{
- wikitty.addToField(<%=extensionVariableName%>, <%=clazz.getName()%>.<%=fieldVariableName%>, element);
+ wikitty.addToField(<%=extensionVariableName%>, <%=fieldVariableName%>, element);
}*/;
setOperationBody(adder, adderBody);
-
+
String removeName = "remove" + StringUtils.capitalize(attributeName);
ObjectModelOperation remover = addOperation(helper, removeName, "void");
- addAnnotation(helper, remover, "Override");
- addParameter(getter, "Wikitty", "wikitty");
+ addParameter(remover, "Wikitty", "wikitty");
addParameter(remover, "String", "element");
String removerBody = ""
/*{
- wikitty.removeFromField(<%=extensionVariableName%>, <%=clazz.getName()%>.<%=fieldVariableName%>, element);
+ wikitty.removeFromField(<%=extensionVariableName%>, <%=fieldVariableName%>, element);
}*/;
setOperationBody(remover, removerBody);
String clearName = "clear" + StringUtils.capitalize(attributeName);
ObjectModelOperation clear = addOperation(helper, clearName, "void");
- addAnnotation(helper, clear, "Override");
- addParameter(getter, "Wikitty", "wikitty");
+ addParameter(clear, "Wikitty", "wikitty");
String clearBody = ""
/*{
- wikitty.clearField(<%=extensionVariableName%>, <%=clazz.getName()%>.<%=fieldVariableName%>);
+ wikitty.clearField(<%=extensionVariableName%>, <%=fieldVariableName%>);
}*/;
setOperationBody(clear, clearBody);
@@ -121,7 +113,6 @@
// adding getter and setter to contract
String getterName = "get" + StringUtils.capitalize(attributeName);
ObjectModelOperation getter = addOperation(helper, getterName, attributeType);
- addAnnotation(helper, getter, "Override");
addParameter(getter, "Wikitty", "wikitty");
setOperationBody(getter, ""
/*{
@@ -131,12 +122,11 @@
String setterName = "set" + StringUtils.capitalize(attributeName);
ObjectModelOperation setter = addOperation(helper, setterName, "void");
- addAnnotation(helper, setter, "Override");
- addParameter(getter, "Wikitty", "wikitty");
+ addParameter(setter, "Wikitty", "wikitty");
addParameter(setter, attributeType, attributeName);
setOperationBody(setter, ""
/*{
- wikitty.setField(<%=extensionVariableName%>, <%=clazz.getName()%>.<%=fieldVariableName%>, <%=attribute.getName()%>);
+ wikitty.setField(<%=extensionVariableName%>, <%=fieldVariableName%>, <%=attribute.getName()%>);
}*/);
}
}
Modified: branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyTransformerUtil.java
===================================================================
--- branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyTransformerUtil.java 2010-08-13 13:40:59 UTC (rev 260)
+++ branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyTransformerUtil.java 2010-08-13 15:21:26 UTC (rev 261)
@@ -1,5 +1,8 @@
package org.nuiton.wikitty.generator;
+import java.util.HashSet;
+import java.util.Set;
+
import org.nuiton.eugene.models.object.ObjectModelAttribute;
import org.nuiton.eugene.models.object.ObjectModelClass;
@@ -25,15 +28,28 @@
/** given a class called Client will return "EXT_CLIENT"
* should be used as a variable name to store the extension name
+ * @param withClassNamePrefix add class name as prefix (will return "Client.EXT_CLIENT")
*/
- protected static String classToExtensionVariableName(ObjectModelClass clazz) {
- String extensionVariableName = "EXT_" + clazz.getName().toUpperCase();
+ protected static String classToExtensionVariableName(ObjectModelClass clazz,
+ boolean withClassNamePrefix) {
+ String extensionVariableName = "";
+ if (withClassNamePrefix) {
+ extensionVariableName += clazz.getName() + ".";
+ }
+ extensionVariableName += "EXT_" + clazz.getName().toUpperCase();
return extensionVariableName;
}
- /** given the field name of the class client, will return FIELD_CLIENT_NAME */
- protected static String attributeToFielVariableName(ObjectModelAttribute attribute) {
- String fieldVariableName = "FIELD_" + attribute.getDeclaringElement().getName().toUpperCase() + "_" + attribute.getName().toUpperCase();
+ /** given the field name of the class Client, will return "FIELD_CLIENT_NAME"
+ * @param withClassNamePrefix add class name as prefix (ie "Client.FIELD_CLIENT_NAME")
+ */
+ protected static String attributeToFielVariableName(ObjectModelAttribute attribute,
+ boolean withClassNamePrefix) {
+ String fieldVariableName = "";
+ if (withClassNamePrefix) {
+ fieldVariableName += attribute.getDeclaringElement().getName() + ".";
+ }
+ fieldVariableName += "FIELD_" + attribute.getDeclaringElement().getName().toUpperCase() + "_" + attribute.getName().toUpperCase();
return fieldVariableName;
}
@@ -52,7 +68,7 @@
|| clazz.hasStereotype(BUSINESS_ENTITY_STEREOTYPE_OLD_NAME);
return result;
}
-
+
/**
* wikitty interface provide getFieldAsString, getFieldAsDate etc. methods
* this method returns the good name of the method to call depending the
@@ -73,22 +89,45 @@
}
return "getFieldAs" + asWhat;
}
-
- protected static String generateResultType(String typeName) {
- String asWhat = FQNtoSimpleName(typeName);
- if ("boolean".equals(asWhat)) {
- // asWhat = "boolean";
- } else if ("int".equals(asWhat) || "Integer".equals(asWhat)) {
- // asWhat = "Int";
- } else if ("Date".equals(asWhat)) {
- // asWhat = "Date";
+ /** for a given type of attribute, the getter returned type must be... */
+ protected static String generateResultType(ObjectModelAttribute attribute,
+ boolean considerMultiplicity) {
+ String type = FQNtoSimpleName(attribute.getType());
+
+ if ("boolean".equals(type) || "Boolean".equals(type)) {
+ //
+ } else if ("int".equals(type) || "Integer".equals(type)) {
+ //
+ } else if ("Date".equals(type)) {
+ //
} else {
- asWhat = "String";
+ type = "String";
}
- return asWhat;
+
+ String result = type;
+ if (considerMultiplicity && isAttributeCollection(attribute)) {
+ result = "Collection<" + type + ">";
+ if (attribute.isUnique()) {
+ if (attribute.isOrdered()) {
+ // FIXME 20100813 doesn't take isUnique into account
+ result = "List<" + type + ">";
+ } else {
+ result = "Set<" + type + ">";
+ }
+ } else {
+ result = "List<" + type + ">";
+ }
+ }
+
+ return result;
}
+ public static boolean isAttributeCollection(ObjectModelAttribute attribute) {
+ return attribute.getMaxMultiplicity() == -1 // -1 is infinity
+ || attribute.getMaxMultiplicity() > 1;
+ }
+
protected static String typeToWikittyColumn(String type) {
String simpleType = FQNtoSimpleName(type);
String result = null;
@@ -106,7 +145,6 @@
}
return result;
}
-
}
1
0