Skip to content

Commit bfd4c20

Browse files
zfizfi
authored
Merge pull request #882 from zfi/master
Updates to release 0.94.304
2 parents e348960 + fc3b322 commit bfd4c20

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+8504
-6365
lines changed

‎pom.xml‎

Lines changed: 36 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,13 @@
1919
<metrics-version>3.1.0</metrics-version>
2020
<jersey.version>1.19</jersey.version>
2121
</properties>
22+
23+
<repositories>
24+
<repository>
25+
<id>netbeans.maven2.repository</id>
26+
<url>http://bits.netbeans.org/maven2/</url>
27+
</repository>
28+
</repositories>
2229

2330
<build>
2431
<resources>
@@ -55,6 +62,7 @@
5562
<configuration>
5663
<source>1.7</source>
5764
<target>1.7</target>
65+
<showDeprecation>true</showDeprecation>
5866
</configuration>
5967
</plugin>
6068
<plugin>
@@ -90,7 +98,7 @@
9098
<dependency>
9199
<groupId>mysql</groupId>
92100
<artifactId>mysql-connector-java</artifactId>
93-
<version>5.1.35</version>
101+
<version>5.1.40</version>
94102
</dependency>
95103
</dependencies>
96104

@@ -224,15 +232,16 @@
224232
</dependency>
225233

226234
<!-- Dependencies for logging -->
235+
<!-- sl4fj is a facade for various logging frameworks -->
227236
<dependency>
228237
<groupId>org.slf4j</groupId>
229238
<artifactId>slf4j-api</artifactId>
230-
<version>1.7.6</version>
239+
<version>1.7.21</version>
231240
</dependency>
232241
<dependency>
233242
<groupId>org.slf4j</groupId>
234243
<artifactId>slf4j-log4j12</artifactId>
235-
<version>1.7.6</version>
244+
<version>1.7.21</version>
236245
</dependency>
237246
<!-- END Logging Dependencies -->
238247

@@ -457,7 +466,7 @@
457466
<dependency>
458467
<groupId>mysql</groupId>
459468
<artifactId>mysql-connector-java</artifactId>
460-
<version>5.1.6</version>
469+
<version>5.1.40</version>
461470
</dependency>
462471

463472
<dependency>
@@ -472,8 +481,6 @@
472481
<version>1.8.3</version>
473482
</dependency>
474483

475-
476-
477484
<!-- Clients for other Parallax servers -->
478485
<dependency>
479486
<groupId>com.parallax.client</groupId>
@@ -486,8 +493,29 @@
486493
<artifactId>Cloud-Compiler-java-client</artifactId>
487494
<version>1.0-SNAPSHOT</version>
488495
</dependency>
489-
490-
496+
497+
<!-- Unit Testing -->
498+
<dependency>
499+
<groupId>junit</groupId>
500+
<artifactId>junit</artifactId>
501+
<version>4.11</version>
502+
<scope>test</scope>
503+
</dependency>
504+
505+
<!-- https://mvnrepository.com/artifact/org.netbeans.api/org-netbeans-modules-nbjunit -->
506+
<!-- <dependency>
507+
<groupId>org.netbeans.api</groupId>
508+
<artifactId>org-netbeans-modules-nbjunit</artifactId>
509+
<version>RELEASE801</version>
510+
</dependency>
511+
-->
512+
<!-- https://mvnrepository.com/artifact/org.netbeans.api/org-netbeans-modules-jellytools-platform -->
513+
<!-- <dependency>
514+
<groupId>org.netbeans.api</groupId>
515+
<artifactId>org-netbeans-modules-jellytools-platform</artifactId>
516+
<version>RELEASE801</version>
517+
</dependency>
518+
-->
491519
</dependencies>
492520

493521
</project>

‎src/main/config/default/log4j.xml‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,12 @@
66
<param name="ConversionPattern" value="%d [%t] %-5p %c %x - %m%n"/>
77
</layout>
88
</appender>
9-
<root>
10-
<priority value="info"></priority>
11-
<appender-ref ref="stdout"/>
12-
</root>
13-
<Logger name="log4j.category.com.parallax.server" level="DEBUG"/>
9+
<loggers>
10+
<Logger name="com.parallax.server.blocklyprop.monitoring" level="trace" additivity="false">
11+
<AppenderRef ref="stdout"/>
12+
</Logger>
13+
<root level="info">
14+
<appender-ref ref="stdout"/>
15+
</root>
16+
</loggers>
1417
</log4j:configuration>

‎src/main/java/com/parallax/server/blocklyprop/converter/ProjectConverter.java‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,8 @@ public JsonObject toJson(ProjectRecord project) {
8484
result.addProperty("modified", DateConversion.toDateTimeString(project.getModified().getTime()));
8585
boolean isYours = project.getIdUser().equals(BlocklyPropSecurityUtils.getCurrentUserId());
8686
result.addProperty("yours", isYours);
87-
if (!isYours) {
88-
result.addProperty("user", userService.getUserScreenName(project.getIdUser()));
89-
90-
} else {
87+
result.addProperty("user", userService.getUserScreenName(project.getIdUser()));
88+
if (isYours) {
9189
List<ProjectSharingRecord> projectSharingRecords = projectSharingService.getSharingInfo(project.getId());
9290
if (projectSharingRecords != null && !projectSharingRecords.isEmpty()) {
9391
result.addProperty("share-key", projectSharingRecords.get(0).getSharekey());
@@ -126,9 +124,7 @@ public JsonObject toJson(Project project) {
126124
result.addProperty("modified", DateConversion.toDateTimeString(project.getModified().getTime()));
127125
boolean isYours = project.getIdUser().equals(BlocklyPropSecurityUtils.getCurrentUserId());
128126
result.addProperty("yours", isYours);
129-
if (!isYours) {
130-
result.addProperty("user", userService.getUserScreenName(project.getIdUser()));
131-
}
127+
result.addProperty("user", userService.getUserScreenName(project.getIdUser()));
132128

133129
if (project.getBasedOn() != null) {
134130
JsonObject basedOn = new JsonObject();

‎src/main/java/com/parallax/server/blocklyprop/db/dao/ProjectDao.java‎

Lines changed: 60 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,59 @@ public interface ProjectDao {
1919

2020
ProjectRecord getProject(Long idProject);
2121

22-
ProjectRecord createProject(String name, String description, String descriptionHtml, String code, ProjectType type, String board, boolean privateProject, boolean sharedProject);
23-
24-
ProjectRecord createProject(String name, String description, String descriptionHtml, ProjectType type, String board, boolean privateProject, boolean sharedProject);
25-
26-
ProjectRecord updateProject(Long idProject, String name, String description, String descriptionHtml, boolean privateProject, boolean sharedProject);
27-
28-
ProjectRecord updateProject(Long idProject, String name, String description, String descriptionHtml, String code, boolean privateProject, boolean sharedProject);
29-
30-
ProjectRecord saveCode(Long idProject, String code);
31-
32-
List<ProjectRecord> getUserProjects(Long idUser, TableSort sort, TableOrder order, Integer limit, Integer offset);
33-
34-
List<ProjectRecord> getSharedProjects(TableSort sort, TableOrder order, Integer limit, Integer offset, Long idUser);
22+
ProjectRecord createProject(
23+
String name,
24+
String description,
25+
String descriptionHtml,
26+
String code,
27+
ProjectType type,
28+
String board,
29+
boolean privateProject,
30+
boolean sharedProject);
31+
32+
ProjectRecord createProject(
33+
String name,
34+
String description,
35+
String descriptionHtml,
36+
ProjectType type,
37+
String board,
38+
boolean privateProject,
39+
boolean sharedProject);
40+
41+
ProjectRecord updateProject(
42+
Long idProject,
43+
String name,
44+
String description,
45+
String descriptionHtml,
46+
boolean privateProject,
47+
boolean sharedProject);
48+
49+
ProjectRecord updateProject(
50+
Long idProject,
51+
String name,
52+
String description,
53+
String descriptionHtml,
54+
String code,
55+
boolean privateProject,
56+
boolean sharedProject);
57+
58+
ProjectRecord saveCode(
59+
Long idProject,
60+
String code);
61+
62+
List<ProjectRecord> getUserProjects(
63+
Long idUser,
64+
TableSort sort,
65+
TableOrder order,
66+
Integer limit,
67+
Integer offset);
68+
69+
List<ProjectRecord> getSharedProjects(
70+
TableSort sort,
71+
TableOrder order,
72+
Integer limit,
73+
Integer offset,
74+
Long idUser);
3575

3676
int countUserProjects(Long idUser);
3777

@@ -41,8 +81,13 @@ public interface ProjectDao {
4181

4282
boolean deleteProject(Long idProject);
4383

44-
ProjectRecord updateProjectCode(Long idProject, String code);
84+
ProjectRecord updateProjectCode(
85+
Long idProject,
86+
String code);
4587

46-
ProjectRecord saveProjectCodeAs(Long idProject, String code, String newName);
88+
ProjectRecord saveProjectCodeAs(
89+
Long idProject,
90+
String code,
91+
String newName);
4792

4893
}

0 commit comments

Comments
 (0)