Skip to content

Commit 7cc8e09

Browse files
author
Nicolas Romanetti
committed
upgrade celerio + various tools that were not committed.
1 parent f87e13a commit 7cc8e09

File tree

11 files changed

+91
-13
lines changed

11 files changed

+91
-13
lines changed

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ install:
3030
- cd web
3131
- npm install --save @angular/material@2.0.0-beta.8 @angular/cdk@2.0.0-beta.8
3232
- npm install --save @angular/animations
33-
- npm install --save primeng@4.1.1
33+
- npm install --save primeng@4.1.3
3434
- npm install --save font-awesome
3535
- cd ..
3636
script:

‎CHANGELOG.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
### Upgrades
77

8-
* primeng from 4.1.0-rc.2 to 4.1.1
8+
* primeng from 4.1.0-rc.2 to 4.1.3
99
* spring-boot from 1.5.2 to 1.5.4
1010
* material from 2.0.0-beta.6 to 2.0.0-beta.8
1111

‎pack-angular/celerio/pack-angular/web/src/app/entities/entity-detail.component.html.e.vm‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -83,12 +83,9 @@ $output.file("web/src/app/entities/${entity.model.var}/${entity.model.var}-detai
8383

8484
<p-fileUpload *ngIf="${entity.model.var}.${identifiableProperty.var}" name="${attr.var}" url="/api/${entity.model.vars}/{{${entity.model.var}.${identifiableProperty.var}}}/upload/${attr.var}" (onUpload)="on${attr.varUp}Upload(${d}event)" >
8585
</p-fileUpload>
86-
<!-- visual hack -->
87-
<p-fileUpload *ngIf="!${entity.model.var}.${identifiableProperty.var}" disabled="true" name="${attr.var}" url="/api/${entity.model.vars}/{{${entity.model.var}.${identifiableProperty.var}}}/upload/${attr.var}" (onUpload)="on${attr.varUp}Upload(${d}event)" >
88-
<ng-template pTemplate="content">
89-
<div>For the moment, you must save the form before being able to upload a file...</div>
90-
</ng-template>
91-
</p-fileUpload>
86+
<p *ngIf="!${entity.model.var}.${identifiableProperty.var}">
87+
Please save the form before being able to upload a file
88+
</p>
9289
#else
9390

9491
<input pInputText id="$attr.var" [(ngModel)]="$valuePath" #required($attr) name="$attr.var" #name="ngModel"/>

‎quickstart/README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Make sure you wait until spring boot starts and listen on port 8080
3333
cd celerio-angular-quickstart/quickstart/web
3434
npm install --save @angular/material@2.0.0-beta.8 @angular/cdk@2.0.0-beta.8
3535
npm install --save @angular/animations
36-
npm install --save primeng@4.1.1
36+
npm install --save primeng@4.1.3
3737
npm install --save font-awesome
3838
ng serve --proxy-config proxy.conf.json
3939

@@ -93,7 +93,7 @@ The 4 command below install some additional dependencies required by the code ge
9393

9494
npm install --save @angular/material@2.0.0-beta.8 @angular/cdk@2.0.0-beta.8
9595
npm install --save @angular/animations
96-
npm install --save primeng@4.1.1
96+
npm install --save primeng@4.1.3
9797
npm install --save font-awesome
9898

9999
Starts a node server on port 4200 using angular cli. The node server proxies the calls to /api and /img to the
@@ -176,7 +176,7 @@ Here are the command lines (hope it is self explanatory):
176176
cd web
177177
npm install --save @angular/material@2.0.0-beta.8 @angular/cdk@2.0.0-beta.8
178178
npm install --save @angular/animations
179-
npm install --save primeng@4.1.1
179+
npm install --save primeng@4.1.3
180180
npm install --save font-awesome
181181
ng build --prod
182182
cp dist/* ../src/main/resources/static

‎quickstart/console1.sh‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
#!/bin/bash
2+
echo ""
3+
echo "**************************************************************************************"
4+
echo "*** THIS SCRIPT REMOVES SOME FOLDERS... RUN IT ONLY IF YOU UNDERSTAND WHAT IT DOES ***"
5+
echo "**************************************************************************************"
6+
echo ""
7+
echo "This script deletes the previously generated src, web and target folders. Do you really want to do that?"
8+
select yn in "Yes" "No"; do
9+
case $yn in
10+
Yes ) echo "OK let's go..."; break;;
11+
No ) exit;;
12+
esac
13+
done
14+
rm -r src web target WELCOME.TXT
15+
ng new web
16+
rm web/src/app/app.module.ts web/src/app/app.component.* web/src/styles.css
17+
mvn -Pdb,metadata,gen generate-sources
18+
mvn spring-boot:run

‎quickstart/console2.sh‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#!/bin/bash
2+
cd web
3+
npm install --save @angular/material@2.0.0-beta.8 @angular/cdk@2.0.0-beta.8
4+
npm install --save @angular/animations
5+
npm install --save primeng@4.1.3
6+
npm install --save font-awesome
7+
ng serve --proxy-config proxy.conf.json
8+

‎quickstart/docker/Dockerfile‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
FROM fabric8/java-jboss-openjdk8-jdk:1.0.13
2+
3+
ENV JAVA_APP_JAR celerio-angular-quickstart.jar
4+
ENV AB_OFF true
5+
ENV JAVA_OPTIONS -Dspring.profiles.active=demowithdocker
6+
7+
EXPOSE 8080
8+
9+
COPY celerio-angular-quickstart.jar /app/
10+
USER root
11+
RUN mkdir /db
12+
COPY angulardb.mv.db /db/
13+
RUN chown -R jboss:jboss /db
14+
USER jboss
15+
VOLUME ["/db"]
16+

‎quickstart/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
<!-- Version dependencies when used in multiple dependencies -->
7474
<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
7575
<celerio-maven-plugin.outputDir>${project.basedir}</celerio-maven-plugin.outputDir>
76-
<celerio-maven-plugin.version>4.0.18</celerio-maven-plugin.version>
76+
<celerio-maven-plugin.version>4.0.23</celerio-maven-plugin.version>
7777

7878
<celerio-maven-plugin.configuration>../quickstart-conf/celerio-maven-plugin.xml</celerio-maven-plugin.configuration>
7979
<celerio-maven-plugin.packs.configuration>../quickstart-conf/celerio-template-packs.xml</celerio-maven-plugin.packs.configuration>
@@ -459,4 +459,4 @@
459459
</build>
460460
</profile>
461461
</profiles>
462-
</project>
462+
</project>

‎quickstart/tool-publish-docker-image.sh‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#!/bin/bash
2+
./tool-rm-gen-and-package.sh
3+
cp target/celerio-angular-quickstart.jar docker/.
4+
cp target/db/angulardb.mv.db docker/.
5+
cd docker
6+
docker build -t celerio-angular-quickstart .
7+
docker tag celerio-angular-quickstart nromanetti/celerio-angular-quickstart
8+
docker push nromanetti/celerio-angular-quickstart
9+

‎quickstart/tool-rm-gen-and-package.sh‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
#!/bin/bash
2+
echo ""
3+
echo "**************************************************************************************"
4+
echo "*** THIS SCRIPT REMOVES SOME FOLDERS... RUN IT ONLY IF YOU UNDERSTAND WHAT IT DOES ***"
5+
echo "**************************************************************************************"
6+
echo ""
7+
echo "This script deletes the previously generated src, web and target folders. Do you really want to do that?"
8+
select yn in "Yes" "No"; do
9+
case $yn in
10+
Yes ) echo "OK let's go..."; break;;
11+
No ) exit;;
12+
esac
13+
done
14+
rm -r src web target WELCOME.TXT
15+
ng new web
16+
rm web/src/app/app.module.ts web/src/app/app.component.* web/src/styles.css
17+
mvn -Pdb,metadata,gen generate-sources
18+
cd web
19+
npm install --save @angular/animations
20+
npm install --save @angular/material@2.0.0-beta.8 @angular/cdk@2.0.0-beta.8
21+
npm install --save primeng@4.1.3
22+
npm install --save font-awesome
23+
ng build --prod
24+
cp dist/* ../src/main/resources/static
25+
cd ..
26+
mvn package

0 commit comments

Comments
 (0)