From 32f7cd07d96ef14bc5a26592589de48b020dabce Mon Sep 17 00:00:00 2001 From: 0qln <0qln@proton.me> Date: Fri, 17 Apr 2026 10:04:51 +0200 Subject: [PATCH] refactoring --- bin/Kapitel7_Angular_Teil2_Praktikum.war | Bin 2962 -> 0 bytes bin/build | 3 + bin/deploy | 8 ++ bin/run | 6 ++ bin/start | 8 ++ client/pom.xml | 37 ++++++++ .../demo/uebung1/aufgabe16/Client.java | 4 +- .../demo/uebung1/aufgabe17/Client.java | 6 +- flake.nix | 17 +--- pom.xml | 81 +++--------------- server/pom.xml | 33 +++++++ .../demo/uebung1/aufgabe16/Encryptor.java | 0 .../uebung1/aufgabe16/EncryptorRemote.java | 0 .../demo/uebung1/aufgabe17/Counter.java | 0 .../demo/uebung1/aufgabe17/CounterRemote.java | 0 .../src}/main/resources/META-INF/beans.xml | 0 .../main/resources/META-INF/persistence.xml | 0 .../src}/main/webapp/WEB-INF/beans.xml | 0 .../src}/main/webapp/WEB-INF/faces-config.xml | 0 .../src}/main/webapp/WEB-INF/web.xml | 0 20 files changed, 113 insertions(+), 90 deletions(-) delete mode 100644 bin/Kapitel7_Angular_Teil2_Praktikum.war create mode 100755 bin/build create mode 100755 bin/deploy create mode 100755 bin/run create mode 100755 bin/start create mode 100644 client/pom.xml rename {src => client/src}/main/java/org/example/demo/uebung1/aufgabe16/Client.java (86%) rename src/main/java/org/example/demo/uebung1/aufgabe17/CounterClient.java => client/src/main/java/org/example/demo/uebung1/aufgabe17/Client.java (76%) mode change 100755 => 100644 pom.xml create mode 100755 server/pom.xml rename {src => server/src}/main/java/org/example/demo/uebung1/aufgabe16/Encryptor.java (100%) rename {src => server/src}/main/java/org/example/demo/uebung1/aufgabe16/EncryptorRemote.java (100%) rename {src => server/src}/main/java/org/example/demo/uebung1/aufgabe17/Counter.java (100%) rename {src => server/src}/main/java/org/example/demo/uebung1/aufgabe17/CounterRemote.java (100%) rename {src => server/src}/main/resources/META-INF/beans.xml (100%) rename {src => server/src}/main/resources/META-INF/persistence.xml (100%) rename {src => server/src}/main/webapp/WEB-INF/beans.xml (100%) rename {src => server/src}/main/webapp/WEB-INF/faces-config.xml (100%) rename {src => server/src}/main/webapp/WEB-INF/web.xml (100%) diff --git a/bin/Kapitel7_Angular_Teil2_Praktikum.war b/bin/Kapitel7_Angular_Teil2_Praktikum.war deleted file mode 100644 index 202649736843345243b62e2d7280b6709138441d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2962 zcmWIWW@h1H0D*}<{k|X?hB+Ao7<^qr9CbbY-1I{uco-D+io^)*6^Z%ED8c~JCc?nM zz`-Ckp%F!!2(mU`M?X(D*WeI6UpJ5mVtYkmZ1ypMP5A74=CqHuuHHpnZ(Xf(XU=a9 zGPq*=;Azo0PaVB$ydF9yHv~O+`sgVWLx49s$DzDEi>59 zZ)e!@H8}{h-dAAlJUeY#HEaF`#VRKK2mD#dPKj?;+DvyBzO#H1LuZ&&ZM@M>uC(-p zH*YdFJYAl|Wx*i1sL)Mcax_z^q>(}y?Y41D4Y5nH*>+7kN8^pUg z6k7xyrQV3!{4qV=nd4)t$@Avr%(1T0^VLgkMLo{&XW!Lj_Dr?JD}BpiTiF*{v)ZQ> z{xEo#GbiB8#d&=BwVMR$4{Mw<{afF6@Mk>7$HNg;(PxTm*qZo!*MBY5nOVG3UuFk~ z%E$JHEaz=NW?f5l=SWB2Tv3=9k`68Pc>TX-dwrllt)r5b{R9TZ-esZ0+o z*!8dkJKPwT#FEn7@YJN>)S|M?+L9zbAjv}_(<#lwrF9iJ*V-4KC zAg9OBaHXLkliTJM8@Jk>-*(w($z9)Vn_d5gzG@bd|HJrC*X9Nq4@A~gJ3sQ<>-mkoNhT+rgWxif)9 ze$V20;@|f?-@Ww|OIqPor_K#YdxDl;?|QWE!o7KotNz`X$oI_P{QsT%cYl6#*Dmp@ z{LytcB93foRXy}eKwo#?vDb|8r*9nOS|^ycc$%f~S5Gs4%a#MOb2Go>RaR7M*os%n zW{c$sJUf45*_7aQ&82sqoaSAud}veky|4Q7Htu@*!0g?JNM0c!x!6zKheKnkrr%ta zCusK1-G9UCKq2!d^Sq*0mMkpZ7Tmq%?K$%U(hK<`X1wqAJ0$gK1Djvhmy;iQs;9em zhx1Ex8t(ro`#Ap0wzG@Ra#);5GlluUz-z>Yn2f zANn`$`pPRkU*AGpqWf57-U5rlZH9c}so%~dT+Z0$GtIN_&eQjC{I~1D#mVoAnxKuf&cr$k2*(k2k z@YPK_id)NXY0p}NU;4Sz%Vtg}nWX#T^ba1Z#RjK(_#Zf1&RY`U&22yD%)GPn=6rs8 z^L@>1aN;W9&y=^}`5X0i!5YyYt7e(?G6#M;cv`^fO5axgSDkC4wndrfu3NS$G*-k^ z)2I1hKKJ4^#hFrOj45*xwyL$Rd$z;J;L8)2n-@~fKH@2!zF+ONcdYTLtZfA+x{WqE zO72^eiBX3pVbWbV#76d7-k*&EyZu&I)~B%*@Os z^5v&Mf<%t<=VSq9+XRWg3!QrMO+4AlLc{pEm-*@xL>Ha?w<7FoRHVcWCJoUv^RC*nsYi8g>RzzS416p+(YAf1Dy!{>-y6;t zT)S{VZR_8R`Qk-)ti)X3U9fuX;UZD9ye#BFSe*6?m2QV)mQUxUai-Tk{Bo+R;K#`= z9+PIh(l@h6>q!5%-?-(X``#0#oaGC*@?Y<`>|gnE|1TNN_=T=qU9nI1yDhFu(qH*N zQBJVp+?v3hAu56wqV3;rntasY-?B81!Xw{XbUWrxNt|(MZ$rqjlx08L%wo^Q`i8BT zb1vC;y`YkT^X$?KZx*&s@ztKc`_(eXzu9Z5A1*E5rI?aG;kj^XWk#K-t#kbsndbNB z48HIlelD?e`$nHPB99wSzMt_a!CoxF;^^BK;XKD*_0@kg{B(?|+;8E#`oiy#in~3m zo0mLvW%w)MCZMeHJTNFxps?pLr`iTz@r*Mq&?P%rtFhVQE*jQ$bC&r>f~~dEo#Q* zHy`&MUw3!G;-(ep6<*4zk8jF@>V{UMcba_63=H#FAsG&PP0WLo;c_yQuv7<(Orp%# z^>Q-sz#1+NZyiBQq_ztOyzLU;4Kf0f-$5-G_;Td60~M>sZ8rFdmYoA&!Iu1}hsVrE)TG OGF)I{U|7Qe;sF4e_Zsj3 diff --git a/bin/build b/bin/build new file mode 100755 index 0000000..da37364 --- /dev/null +++ b/bin/build @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +mvn clean package diff --git a/bin/deploy b/bin/deploy new file mode 100755 index 0000000..6ad5a47 --- /dev/null +++ b/bin/deploy @@ -0,0 +1,8 @@ +#!/usr/bin/env bash + +# deploy the server +# +# usage: +# deploy server/target/ejb-uebung-1.0-SNAPSHOT.jar + +cp -v "$1" "$WILDFLY_BASE_DIR/deployments/" diff --git a/bin/run b/bin/run new file mode 100755 index 0000000..da756a4 --- /dev/null +++ b/bin/run @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +# usage +# run org.example.demo.uebung1.aufgabe16.Client + +(cd client && mvn clean compile && mvn exec:java -Dexec.mainClass="$1") diff --git a/bin/start b/bin/start new file mode 100755 index 0000000..ee20d2c --- /dev/null +++ b/bin/start @@ -0,0 +1,8 @@ +#!/usr/bin/env bash + +# starts the server +# +# usage: +# start + +wildfly-fhs diff --git a/client/pom.xml b/client/pom.xml new file mode 100644 index 0000000..ca2d205 --- /dev/null +++ b/client/pom.xml @@ -0,0 +1,37 @@ + + + 4.0.0 + + de.componentware + componentware-parent + 1.0-SNAPSHOT + ../pom.xml + + ejb-client + jar + + + + de.componentware + ejb-uebung + 1.0-SNAPSHOT + + + + org.wildfly + wildfly-ejb-client-bom + 39.0.0.Final + pom + import + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.11.0 + + + + diff --git a/src/main/java/org/example/demo/uebung1/aufgabe16/Client.java b/client/src/main/java/org/example/demo/uebung1/aufgabe16/Client.java similarity index 86% rename from src/main/java/org/example/demo/uebung1/aufgabe16/Client.java rename to client/src/main/java/org/example/demo/uebung1/aufgabe16/Client.java index 6edafc5..e7926e4 100644 --- a/src/main/java/org/example/demo/uebung1/aufgabe16/Client.java +++ b/client/src/main/java/org/example/demo/uebung1/aufgabe16/Client.java @@ -11,8 +11,8 @@ public class Client { props.setProperty(Context.PROVIDER_URL, "http-remoting://localhost:8080"); InitialContext ctx = new InitialContext(props); - EncryptorRemote encryptor = (EncryptorRemote) ctx.lookup( - "ejb:/demo/Encryptor!encryption.EncryptorRemote"); + String jndiName = "ejb:/ejb-uebung-1.0-SNAPSHOT/Encryptor!org.example.demo.uebung1.aufgabe16.EncryptorRemote"; + EncryptorRemote encryptor = (EncryptorRemote) ctx.lookup(jndiName); String original = "Hallo Welt"; String encrypted = encryptor.encrypt(original); diff --git a/src/main/java/org/example/demo/uebung1/aufgabe17/CounterClient.java b/client/src/main/java/org/example/demo/uebung1/aufgabe17/Client.java similarity index 76% rename from src/main/java/org/example/demo/uebung1/aufgabe17/CounterClient.java rename to client/src/main/java/org/example/demo/uebung1/aufgabe17/Client.java index 97ba7c9..5a5fdd1 100644 --- a/src/main/java/org/example/demo/uebung1/aufgabe17/CounterClient.java +++ b/client/src/main/java/org/example/demo/uebung1/aufgabe17/Client.java @@ -3,7 +3,7 @@ import javax.naming.InitialContext; import javax.naming.Context; import java.util.Properties; -public class CounterClient { +public class Client { public static void main(String[] args) throws Exception { Properties props = new Properties(); props.setProperty(Context.INITIAL_CONTEXT_FACTORY, @@ -11,8 +11,8 @@ public class CounterClient { props.setProperty(Context.PROVIDER_URL, "http-remoting://localhost:8080"); InitialContext ctx = new InitialContext(props); - CounterRemote counter = (CounterRemote) ctx.lookup( - "ejb:/demo/Counter!counter.CounterRemote?stateful"); + String jndiName = "ejb:/ejb-uebung-1.0-SNAPSHOT/Counter!org.example.demo.uebung1.aufgabe17.CounterRemote?stateful"; + CounterRemote counter = (CounterRemote) ctx.lookup(jndiName); System.out.println(counter.getAndIncrement()); System.out.println(counter.getAndIncrement()); diff --git a/flake.nix b/flake.nix index 24c2d8c..47f2d03 100644 --- a/flake.nix +++ b/flake.nix @@ -129,7 +129,7 @@ devShells.default = with pkgs; mkShell { - buildInputs = [wildfly-fhs pkgs.openjdk21]; + buildInputs = [wildfly-fhs pkgs.openjdk21 maven]; nativeBuildInputs = []; packages = [ @@ -143,21 +143,8 @@ shellHook = # bash '' + export PATH="bin/:$PATH" export WILDFLY_BASE_DIR="$HOME/.wildfly-fhs-base" - - build() { - # builds target/demo.war - mvn clean package - } - - # e.g. 'deploy target/demo.war' - deploy() { - cp -v "$1" "$WILDFLY_BASE_DIR/deployments/" - } - - start() { - wildfly-fhs - } ''; }; }; diff --git a/pom.xml b/pom.xml old mode 100755 new mode 100644 index 8db13bb..6d67ea5 --- a/pom.xml +++ b/pom.xml @@ -1,76 +1,17 @@ - - + + 4.0.0 - org.example - demo + de.componentware + componentware-parent 1.0-SNAPSHOT - demo - war + pom + + server + client + + 21 + 21 UTF-8 - UTF-8 - 21 - 5.11.0-M2 - 3.13.0 - 3.4.0 - - - jakarta.platform - jakarta.jakartaee-web-api - 11.0.0 - provided - - - org.glassfish - jakarta.faces - 4.1.3 - - - jakarta.enterprise - jakarta.enterprise.cdi-api - 4.1.0 - - - jakarta.enterprise - jakarta.enterprise.cdi-el-api - 4.1.0 - - - org.jboss.weld.servlet - weld-servlet-core - 5.1.2.Final - - - org.junit.jupiter - junit-jupiter-api - ${junit.version} - - - org.projectlombok - lombok - 1.18.30 - - - org.primefaces - primefaces - 15.0.3 - jakarta - - - - demo - - - org.apache.maven.plugins - maven-compiler-plugin - ${compiler-plugin.version} - - - org.apache.maven.plugins - maven-war-plugin - ${war-plugin.version} - - - diff --git a/server/pom.xml b/server/pom.xml new file mode 100755 index 0000000..915da1c --- /dev/null +++ b/server/pom.xml @@ -0,0 +1,33 @@ + + + 4.0.0 + + de.componentware + componentware-parent + 1.0-SNAPSHOT + ../pom.xml + + ejb-uebung + ejb + + + + jakarta.platform + jakarta.jakartaee-api + 10.0.0 + provided + + + + + + org.apache.maven.plugins + maven-ejb-plugin + 3.2.1 + + 4.0 + + + + + diff --git a/src/main/java/org/example/demo/uebung1/aufgabe16/Encryptor.java b/server/src/main/java/org/example/demo/uebung1/aufgabe16/Encryptor.java similarity index 100% rename from src/main/java/org/example/demo/uebung1/aufgabe16/Encryptor.java rename to server/src/main/java/org/example/demo/uebung1/aufgabe16/Encryptor.java diff --git a/src/main/java/org/example/demo/uebung1/aufgabe16/EncryptorRemote.java b/server/src/main/java/org/example/demo/uebung1/aufgabe16/EncryptorRemote.java similarity index 100% rename from src/main/java/org/example/demo/uebung1/aufgabe16/EncryptorRemote.java rename to server/src/main/java/org/example/demo/uebung1/aufgabe16/EncryptorRemote.java diff --git a/src/main/java/org/example/demo/uebung1/aufgabe17/Counter.java b/server/src/main/java/org/example/demo/uebung1/aufgabe17/Counter.java similarity index 100% rename from src/main/java/org/example/demo/uebung1/aufgabe17/Counter.java rename to server/src/main/java/org/example/demo/uebung1/aufgabe17/Counter.java diff --git a/src/main/java/org/example/demo/uebung1/aufgabe17/CounterRemote.java b/server/src/main/java/org/example/demo/uebung1/aufgabe17/CounterRemote.java similarity index 100% rename from src/main/java/org/example/demo/uebung1/aufgabe17/CounterRemote.java rename to server/src/main/java/org/example/demo/uebung1/aufgabe17/CounterRemote.java diff --git a/src/main/resources/META-INF/beans.xml b/server/src/main/resources/META-INF/beans.xml similarity index 100% rename from src/main/resources/META-INF/beans.xml rename to server/src/main/resources/META-INF/beans.xml diff --git a/src/main/resources/META-INF/persistence.xml b/server/src/main/resources/META-INF/persistence.xml similarity index 100% rename from src/main/resources/META-INF/persistence.xml rename to server/src/main/resources/META-INF/persistence.xml diff --git a/src/main/webapp/WEB-INF/beans.xml b/server/src/main/webapp/WEB-INF/beans.xml similarity index 100% rename from src/main/webapp/WEB-INF/beans.xml rename to server/src/main/webapp/WEB-INF/beans.xml diff --git a/src/main/webapp/WEB-INF/faces-config.xml b/server/src/main/webapp/WEB-INF/faces-config.xml similarity index 100% rename from src/main/webapp/WEB-INF/faces-config.xml rename to server/src/main/webapp/WEB-INF/faces-config.xml diff --git a/src/main/webapp/WEB-INF/web.xml b/server/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from src/main/webapp/WEB-INF/web.xml rename to server/src/main/webapp/WEB-INF/web.xml