Advertisement
Guest User

Untitled

a guest
Oct 11th, 2017
60
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 8.72 KB | None | 0 0
  1. Index: src/main/java/com/netiq/arc/persistence/service/DataCollectionService.java
  2. ===================================================================
  3. --- src/main/java/com/netiq/arc/persistence/service/DataCollectionService.java (revision 164)
  4. +++ src/main/java/com/netiq/arc/persistence/service/DataCollectionService.java (working copy)
  5. @@ -46,7 +46,7 @@
  6. }
  7. }
  8.  
  9. - @Override
  10. +
  11. public IDataCollection startDataCollection(IDataCollector dataCollector)
  12. throws DataCollectionException
  13. {
  14. @@ -55,7 +55,7 @@
  15. return null;
  16. }
  17.  
  18. - @Override
  19. +
  20. public int stopDataCollection(IDataCollection dataCollection)
  21. throws DataCollectionException
  22. {
  23. @@ -63,7 +63,7 @@
  24. return 0;
  25. }
  26.  
  27. - @Override
  28. +
  29. public String testConnection(String serviceConfig)
  30. throws DataCollectionException
  31. {
  32. @@ -71,7 +71,7 @@
  33. return null;
  34. }
  35.  
  36. - @Override
  37. +
  38. public IMappedEntity testCollection(IDataCollector dataCollector)
  39. throws DataCollectionException
  40. {
  41. @@ -79,14 +79,14 @@
  42. return null;
  43. }
  44.  
  45. - @Override
  46. +
  47. public ICollectedUser getAllCollectedUsers(String collectionId)
  48. {
  49. // TODO Implement
  50. return null;
  51. }
  52.  
  53. - @Override
  54. +
  55. public List<ICollectedUser> getCollectedUsers(String collectionId, IQueryConditionGroup conditionGroup)
  56. {
  57. // TODO Implement
  58. Index: src/main/java/com/netiq/arc/persistence/service/DataCollectionConfigService.java
  59. ===================================================================
  60. --- src/main/java/com/netiq/arc/persistence/service/DataCollectionConfigService.java (revision 164)
  61. +++ src/main/java/com/netiq/arc/persistence/service/DataCollectionConfigService.java (working copy)
  62. @@ -63,7 +63,7 @@
  63. m_attrDefList.add(new AttributeDefinition("email", true, AttributeType.STRING, EntityType.USER, false));
  64. }
  65.  
  66. - @Override
  67. +
  68. public List<IAttributeDefinition> getAttributeDefinitions(EntityType type)
  69. throws PersistenceException
  70. {
  71. @@ -71,7 +71,7 @@
  72. return m_attrDefList;
  73. }
  74.  
  75. - @Override
  76. +
  77. public void addExtendedAttributeDefinition(IAttributeDefinition def)
  78. throws PersistenceException
  79. {
  80. @@ -90,7 +90,7 @@
  81. m_attrDefList.add(def);
  82. }
  83.  
  84. - @Override
  85. +
  86. public IAttributeDefinition newExtendedAttributeDefinition(String name, boolean multiValued, AttributeType type, EntityType entityType, int length)
  87. throws PersistenceException
  88. {
  89. @@ -98,7 +98,7 @@
  90. }
  91.  
  92.  
  93. - @Override
  94. +
  95. public List<IDataCollector> getDataCollectors(CollectorType type)
  96. throws PersistenceException
  97. {
  98. @@ -106,7 +106,7 @@
  99. return null;
  100. }
  101.  
  102. - @Override
  103. +
  104. public void addDataCollector(IDataCollector collector)
  105. throws PersistenceException
  106. {
  107. @@ -114,7 +114,7 @@
  108.  
  109. }
  110.  
  111. - @Override
  112. +
  113. public List<ITemplate> getCollectorTemplates(CollectorType type)
  114. throws PersistenceException
  115. {
  116. @@ -122,7 +122,7 @@
  117. return null;
  118. }
  119.  
  120. - @Override
  121. +
  122. public List<IDataCollection> getDataCollections(CollectorType type)
  123. throws PersistenceException
  124. {
  125. @@ -130,7 +130,7 @@
  126. return null;
  127. }
  128.  
  129. - @Override
  130. +
  131. public List<IDataCollection> getDataCollections(CollectorType type, CollectionStatus status)
  132. throws PersistenceException
  133. {
  134. @@ -138,7 +138,7 @@
  135. return null;
  136. }
  137.  
  138. - @Override
  139. +
  140. public List<IDirectory> getDirectories()
  141. throws PersistenceException
  142. {
  143. @@ -146,7 +146,7 @@
  144. return null;
  145. }
  146.  
  147. - @Override
  148. +
  149. public void addDirectory(IDirectory directory)
  150. throws PersistenceException
  151. {
  152. @@ -154,7 +154,7 @@
  153.  
  154. }
  155.  
  156. - @Override
  157. +
  158. public void setAttributeDefinitionAsUsed(IAttributeDefinition attributeDefinition)
  159. throws PersistenceException
  160. {
  161. @@ -162,7 +162,7 @@
  162.  
  163. }
  164.  
  165. - @Override
  166. +
  167. public void updateDataCollector(IDataCollector collector)
  168. throws PersistenceException
  169. {
  170. @@ -170,7 +170,7 @@
  171.  
  172. }
  173.  
  174. - @Override
  175. +
  176. public List<IDataCollection> getDataCollections(CollectorType type, IQueryConditionGroup conditionGroup)
  177. throws PersistenceException
  178. {
  179. Index: pom.xml
  180. ===================================================================
  181. --- pom.xml (revision 164)
  182. +++ pom.xml (working copy)
  183. @@ -62,5 +62,123 @@
  184. <version>1.7.0</version>
  185. </dependency>
  186.  
  187. +
  188. </dependencies>
  189. + <build>
  190. + <plugins>
  191. + <plugin>
  192. + <groupId>org.codehaus.mojo</groupId>
  193. + <artifactId>sql-maven-plugin</artifactId>
  194. + <version>1.4</version>
  195. + <dependencies>
  196. + <dependency>
  197. + <groupId>postgresql</groupId>
  198. + <artifactId>postgresql</artifactId>
  199. + <version>9.0-801.jdbc4</version>
  200. + </dependency>
  201. + </dependencies>
  202. +
  203. + <configuration>
  204. + <driver>org.postgresql.Driver</driver>
  205. + <url>jdbc:postgresql://localhost:5432:arcops</url>
  206. + <username>postgres</username>
  207. + <password>novell</password>
  208. + <!-- You can comment out username/password configurations and
  209. + have maven to look them up in your settings.xml using ${settingsKey}
  210. + -->
  211. + <settingsKey>sensibleKey</settingsKey>
  212. + <!--all executions are ignored if -Dmaven.test.skip=true-->
  213. + <skip>${maven.test.skip}</skip>
  214. + </configuration>
  215. + <executions>
  216. + <execution>
  217. + <id>drop-db-before-test-if-any</id>
  218. + <phase>process-test-resources</phase>
  219. + <goals>
  220. + <goal>execute</goal>
  221. + </goals>
  222. + <configuration>
  223. + <!-- need another database to drop the targeted one -->
  224. + <url>jdbc:postgresql://localhost:5432:bootstrapdb</url>
  225. + <autocommit>true</autocommit>
  226. + <sqlCommand>drop database arcops</sqlCommand>
  227. + <!-- ignore error when database is not avaiable -->
  228. + <onError>continue</onError>
  229. + </configuration>
  230. + </execution>
  231. + <execution>
  232. + <id>create-db</id>
  233. + <phase>process-test-resources</phase>
  234. + <goals>
  235. + <goal>execute</goal>
  236. + </goals>
  237. + <configuration>
  238. + <url>jdbc:postgresql://localhost:5432:arcops</url>
  239. + <!-- no transaction -->
  240. + <autocommit>true</autocommit>
  241. + <sqlCommand>create database arcops</sqlCommand>
  242. + </configuration>
  243. + </execution>
  244. + <execution></execution>
  245. + </executions>
  246. + </plugin>
  247. + <plugin>
  248. + <groupId>org.codehaus.mojo</groupId>
  249. + <artifactId>hibernate3-maven-plugin</artifactId>
  250. + <version>2.2</version>
  251. + <dependencies>
  252. + <dependency>
  253. + <groupId>org.hibernate</groupId>
  254. + <artifactId>hibernate-entitymanager</artifactId>
  255. + <version>3.6.5.Final</version>
  256. + <exclusions>
  257. + <exclusion>
  258. + <groupId>cglib</groupId>
  259. + <artifactId>cglib</artifactId>
  260. + </exclusion>
  261. + <exclusion>
  262. + <groupId>commons-logging</groupId>
  263. + <artifactId>commons-logging</artifactId>
  264. + </exclusion>
  265. + </exclusions>
  266. + </dependency>
  267. + <dependency>
  268. + <groupId>org.hibernate</groupId>
  269. + <artifactId>hibernate-core</artifactId>
  270. + <version>3.6.5.Final</version>
  271. + <exclusions>
  272. + <exclusion>
  273. + <groupId>cglib</groupId>
  274. + <artifactId>cglib</artifactId>
  275. + </exclusion>
  276. + <exclusion>
  277. + <groupId>commons-logging</groupId>
  278. + <artifactId>commons-logging</artifactId>
  279. + </exclusion>
  280. + </exclusions>
  281. + </dependency>
  282. + </dependencies>
  283. + <executions>
  284. + <execution>
  285. + <phase>install</phase>
  286. + <goals>
  287. + <goal>hbm2ddl</goal>
  288. + </goals>
  289. + </execution>
  290. + </executions>
  291. + <configuration>
  292. + <hibernate>
  293. + <configurationFile>src/main/resources/ops.postgres.cfg.xml</configurationFile>
  294. + </hibernate>
  295. + <outputDirectory>
  296. + <hbm2dll>src/main/resources</hbm2dll>
  297. + </outputDirectory>
  298. + <outputFile>dbcreate.sql</outputFile>
  299. + <update>true</update>
  300. + <drop>true</drop>
  301. + <format>true</format>
  302. + </configuration>
  303. + </plugin>
  304. + </plugins>
  305. + </build>
  306. </project>
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement