[
http://mifosforge.jira.com/browse/MIFOS-3925?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Adam Monsen updated MIFOS-3925:
-------------------------------
Labels: (was: patch)
Patch rejected, does not apply cleanly to head/master.
{noformat}
:) [ad...@scraps head <master>]$ git log -1 --oneline
6f922af MIFOS-3841: Adding null check for nextInstallment, caused failure of
ApplyCustomerFeeChangesHelper on testing server
:) [ad...@scraps head <master>]$ git status
# On branch master
nothing to commit (working directory clean)
:) [ad...@scraps head <master>]$ git remote add vorburger
git://github.com/vorburger/mifos-head.git
:) [ad...@scraps head <master>]$ git fetch --quiet vorburger
:) [ad...@scraps head <master>]$ git merge
vorburger/MIFOS-3925__BetterEclipseBuildPath
warning: CRLF will be replaced by LF in
application/src/main/webapp/WEB-INF/classes/README.txt.
CONFLICT (rename/delete): Rename
userInterface/src/main/resources/org/mifos/ui/freemarker/core/home1.ftl->userInterface/src/main/webapp/WEB-INF/freemarker/home1.ftl
in vorburger/MIFOS-3925__BetterEclipseBuildPath and deleted in HEAD
CONFLICT (rename/delete): Rename
userInterface/src/main/resources/org/mifos/ui/freemarker/core/languages.ftl->userInterface/src/main/webapp/WEB-INF/freemarker/languages.ftl
in vorburger/MIFOS-3925__BetterEclipseBuildPath and deleted in HEAD
Auto-merging .classpath
CONFLICT (content): Merge conflict in .classpath
Auto-merging .settings/org.eclipse.wst.common.component
CONFLICT (content): Merge conflict in .settings/org.eclipse.wst.common.component
Auto-merging application/pom.xml
CONFLICT (content): Merge conflict in application/pom.xml
Removing application/src/main/webapp/WEB-INF/freemarker/adminHome1.ftl
Removing application/src/main/webapp/WEB-INF/freemarker/ping.ftl
Automatic merge failed; fix conflicts and then commit the result.
:( 130 [ad...@scraps head <master>]$
{noformat}
> userInterface/src/main/webapp/ not configured in WTP
> ----------------------------------------------------
>
> Key: MIFOS-3925
> URL: http://mifosforge.jira.com/browse/MIFOS-3925
> Project: mifos
> Issue Type: Bug
> Components: Build and Testing
> Reporter: Michael Vorburger
> Assignee: mifosdeveloperqueue
> Priority: Major
> Fix For: Gazelle Backlog
>
>
> Resources in userInterface/src/main/webapp, e.g.
> /userInterface/src/main/webapp/pages/css/maincss.css do not seem to be
> available in the recommended WTP-based set-up, because they are not copied to
> application/target/mifos-webapp (where WTP looks for the "WAR").
> It may work for some people after CLI mvn. This is very cumbersome of
> course, as it would mean that you have to do CLI mvn after each change in
> userInterface/src/main/webapp - not acceptable.
> I've tried simply adding a new Eclipse Project Properties Java Build Path
> Source folder userInterface/src/main/webapp ->
> application/target/mifos-webapp, but that doesn't work due to an error
> message "Cannot nest output folder
> 'vorburger-mifos-head/application/target/mifos-webapp/WEB-INF/freemarker'
> inside output folder 'vorburger-mifos-head/application/target/mifos-webapp'"
> -- which doesn't really make sense to me - may be it's obvious what Eclipse
> is trying to say and I'm just too tired, but I don't yet get it.
> PS: Personally I would set-up the entire workspace differently, via a fully
> Classpath-based embedded Jetty container. (Happy to illustrate on a branch,
> if there is interest in re-integrating - doesn't seem to meet much interest
> though?)
--
This message is automatically generated by JIRA.
-
If you think it was sent incorrectly contact one of the administrators:
http://mifosforge.jira.com/secure/Administrators.jspa
-
For more information on JIRA, see: http://www.atlassian.com/software/jira
------------------------------------------------------------------------------
Achieve Improved Network Security with IP and DNS Reputation.
Defend against bad network traffic, including botnets, malware,
phishing sites, and compromised hosts - saving your company time,
money, and embarrassment. Learn More!
http://p.sf.net/sfu/hpdev2dev-nov
_______________________________________________
Mifos-issues mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mifos-issues
